Eric Lippmann 54577d04bd Merge branch 'master' into bugfix/time-formatting-6778 ... Conflicts: modules/monitoring/application/views/scripts/list/comments.phtml modules/monitoring/application/views/scripts/list/hostgroups.phtml modules/monitoring/application/views/scripts/process/info.phtml modules/monitoring/application/views/scripts/show/components/downtime.phtml modules/monitoring/application/views/scripts/show/components/notifications.phtml modules/monitoring/public/css/module.less		2015-05-21 14:57:01 +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	Drop interface Browsable	2015-05-15 14:37:41 +02:00
fonts	Revert the animate-spin css to the original	2015-02-25 12:07:59 +01:00
forms	Don't override submit label in the ConfirmRemovalForm	2015-05-20 10:30:00 +02:00
layouts/scripts	Use -1 for last update of the menu	2015-03-12 00:52:19 +01:00
locale	Remove exclamation mark from the notification "Authentication order updated!"'s translations	2015-04-27 14:13:26 +02:00
views	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00