Eric Lippmann 82ee1d6e60 Merge branch 'master' into bugfix/significant-whitespaces-8777 ...

Conflicts:
	library/Icinga/Web/Widget/FilterEditor.php

2015-05-18 13:35:28 +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/significant-whitespaces-8777

2015-05-18 13:35:28 +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