Eric Lippmann 54577d04bd Merge branch 'master' into bugfix/time-formatting-6778 ...

Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/hostgroups.phtml
	modules/monitoring/application/views/scripts/process/info.phtml
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
	modules/monitoring/application/views/scripts/show/components/notifications.phtml
	modules/monitoring/public/css/module.less

2015-05-21 14:57:01 +02:00

..

application

Fix form tests utilizing Mockery's partial mock functionality

2015-04-30 15:20:19 +02:00

library/Icinga

Merge branch 'master' into bugfix/time-formatting-6778

2015-05-21 14:57:01 +02:00

regression

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00

res

Extend TranslatorTest with new tests

2014-09-16 16:14:07 +02:00

bootstrap.php

Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL

2015-02-04 10:52:27 +01:00