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 |
Alexander Fuhr
|
b8113b688b
|
Update User\Store\IniStoreTest
|
2014-11-12 17:13:15 +01:00 |
Johannes Meyer
|
7b99b74ae1
|
Prefer Icinga\Application\Config instead of Zend_Config
refs #7147
|
2014-11-07 13:53:03 +01:00 |
Johannes Meyer
|
c93159d287
|
Add test for Icinga\User\Preferences\Store\IniStore
refs #6011
|
2014-04-28 14:06:39 +02:00 |