upstream/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2026-04-28 17:49:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
icingaweb2/application/forms/Config/General
History
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
..
ApplicationConfigForm.php Merge branch 'master' into feature/localization-form-6073 2014-11-13 17:03:41 +01:00
LoggingConfigForm.php Merge branch 'master' into feature/setup-wizard-7163 2014-11-04 14:22:53 +01:00