Eric Lippmann ac2ec83852 Merge branch 'master' into feature/localization-form-6073 ... Conflicts: library/Icinga/Application/ApplicationBootstrap.php test/php/library/Icinga/User/Store/DbStoreTest.php		2014-11-13 17:03:41 +01:00
..
application	Prefer Icinga\Application\Config over Zend_Config	2014-11-11 12:11:14 +01:00
library/Icinga	Merge branch 'master' into feature/localization-form-6073	2014-11-13 17:03:41 +01:00
regression	Fix that Icinga\Web\Url::fromPath drops fragments	2014-08-14 14:23:31 +02:00
res	Extend TranslatorTest with new tests	2014-09-16 16:14:07 +02:00
bootstrap.php	Remove license headers from all files	2014-07-15 13:43:52 +02:00