Johannes Meyer 1c51735629 Merge branch 'master' into feature/rename-monitoring-instances-to-command-transports-and-allow-to-link-them-with-a-monitoring-instance-9651 ... Conflicts: modules/monitoring/application/controllers/ConfigController.php		2015-08-31 13:05:10 +02:00
..
clicommands	Merge branch 'master' into feature/monitoring-restrictions-9009	2015-06-16 17:12:51 +02:00
controllers	Merge branch 'master' into feature/rename-monitoring-instances-to-command-transports-and-allow-to-link-them-with-a-monitoring-instance-9651	2015-08-31 13:05:10 +02:00
forms	TransportConfigForm: Use a select input for setting the instance	2015-08-31 12:17:57 +02:00
locale	locale/it_IT: a few modifications, compile catalog	2015-03-13 17:06:42 +01:00
views	Merge branch 'master' into feature/rename-monitoring-instances-to-command-transports-and-allow-to-link-them-with-a-monitoring-instance-9651	2015-08-31 13:05:10 +02:00