icingaweb2/application
Johannes Meyer a55cced039 Merge branch 'master' into feature/custom-menu-items-5600
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-09-25 14:12:43 +02:00
..
clicommands Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL 2015-02-04 10:52:27 +01:00
controllers NavigationController: Rerender the layout when removing menu entries 2015-09-25 10:51:44 +02:00
fonts font: Add icon-circle 2015-09-07 10:21:17 +02:00
forms Merge branch 'master' into feature/custom-menu-items-5600 2015-09-25 14:12:43 +02:00
layouts/scripts Do not mark relative urls as absolute 2015-09-22 14:12:08 +02:00
locale Update locale it_IT 2015-09-01 23:02:52 +02:00
views NavigationController: Redirect to the shared overview if its the referrer.. 2015-09-23 14:21:04 +02:00
VERSION Change VERSION's format 2015-06-03 18:08:54 +02:00