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	Use timeSince() in the monitoring list command	2015-04-15 15:46:12 +02:00
controllers	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00
forms	Replace ...' w/ ..'	2015-05-18 16:07:28 +02:00
locale	locale/it_IT: a few modifications, compile catalog	2015-03-13 17:06:42 +01:00
views	Merge branch 'master' into bugfix/time-formatting-6778	2015-05-21 14:57:01 +02:00