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	Don't use non-existent Format::timeSince()	2015-06-10 17:50:37 +02:00
controllers	ShowController: Deprecate historyAction	2015-06-16 17:05:41 +02:00
forms	ToggleObjectFeaturesCommandForm: use h2 instead of h4	2015-06-16 01:28:38 +02:00
locale	locale/it_IT: a few modifications, compile catalog	2015-03-13 17:06:42 +01:00
views	Merge remote-tracking branch 'origin/master' into feature/refine-ui-for-rc1-9361	2015-06-18 11:26:51 +02:00