Johannes Meyer a55cced039 Merge branch 'master' into feature/custom-menu-items-5600 ... Conflicts: modules/monitoring/application/views/scripts/list/comments.phtml modules/monitoring/application/views/scripts/list/downtimes.phtml		2015-09-25 14:12:43 +02:00
..
application	Merge branch 'master' into feature/custom-menu-items-5600	2015-09-25 14:12:43 +02:00
doc	monitoring: Document the new restriction filter `instance_name'	2015-09-01 08:33:42 +02:00
library/Monitoring	Merge branch 'master' into feature/custom-menu-items-5600	2015-09-25 14:12:43 +02:00
public	monitoring: Do not show bullet points for actions and notes	2015-09-16 13:32:20 +02:00
test/php	Fix MacroTest	2015-05-28 16:08:21 +02:00
configuration.php	Do not mark relative urls as absolute	2015-09-22 14:12:08 +02:00
module.info	Change version in modules/*/module.info to 2.0.0-rc1	2015-06-08 13:19:46 +02:00