Alexander Fuhr 70ac8077e6 Merge branch 'master' into feature/modules-search-capabilities-6495		2014-09-04 16:33:40 +02:00
..
clicommands	CLI/monitoring/list: fix DataView-related exception	2014-07-31 17:24:56 +02:00
controllers	Merge branch 'master' into feature/modules-search-capabilities-6495	2014-09-04 16:33:40 +02:00
forms	DateTime: Remove global and user formattings	2014-09-04 16:02:10 +02:00
locale	monitoring/tactical: fix missing translations	2014-08-22 18:08:20 +02:00
views	AbstractObject: Rename to MonitoredObject	2014-09-04 14:00:48 +02:00