Johannes Meyer 1d6ad6df21 Merge branch 'master' into feature/custom-menu-items-5600 ... Conflicts: modules/monitoring/configuration.php		2015-09-15 13:31:30 +02:00
..
clicommands	Merge branch 'master' into feature/monitoring-restrictions-9009	2015-06-16 17:12:51 +02:00
controllers	monitoring/api: Use JsonResponse in the ActionsController	2015-09-07 13:37:18 +02:00
forms	Merge branch 'master' into feature/api-9606	2015-09-07 11:33:44 +02:00
locale	Update locale it_IT	2015-09-01 23:02:52 +02:00
views	Merge branch 'master' into feature/custom-menu-items-5600	2015-09-15 13:31:30 +02:00