Thomas Gelf 3462f0ee9a Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361 ... Conflicts: modules/monitoring/application/views/scripts/host/history.phtml modules/monitoring/application/views/scripts/list/services.phtml		2015-06-18 11:26:51 +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	ConfigController: Do not use forward() but redirectNow()	2015-06-17 13:43:59 +02:00
fonts	Revert the animate-spin css to the original	2015-02-25 12:07:59 +01:00
forms	Merge branch 'feature/ssh-remote-connection-resource-configuration-7595'	2015-06-15 17:30:42 +02:00
layouts/scripts	Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361	2015-06-18 11:26:51 +02:00
locale	Remove exclamation mark from the notification "Authentication order updated!"'s translations	2015-04-27 14:13:26 +02:00
views	Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361	2015-06-18 11:26:51 +02:00
VERSION	Change VERSION's format	2015-06-03 18:08:54 +02:00