Eric Lippmann c294283636 Merge branch 'bugfix/service-grid-grouping-postgres-9333' ... Conflicts: modules/monitoring/application/controllers/ListController.php modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php fixes #9333 fixes #9538		2015-08-27 12:58:49 +02:00
..
clicommands	Merge branch 'master' into feature/monitoring-restrictions-9009	2015-06-16 17:12:51 +02:00
controllers	Merge branch 'bugfix/service-grid-grouping-postgres-9333'	2015-08-27 12:58:49 +02:00
forms	Show a spinner when deleting comments or downtimes	2015-08-20 15:49:25 +02:00
locale	locale/it_IT: a few modifications, compile catalog	2015-03-13 17:06:42 +01:00
views	Merge branch 'bugfix/service-grid-grouping-postgres-9333'	2015-08-27 12:58:49 +02:00