Johannes Meyer fb5685bac3 Merge branch 'master' into bugfix/rebuild-form-builder-5525 ... Conflicts: application/forms/Config/Authentication/BaseBackendForm.php application/forms/Config/Authentication/DbBackendForm.php application/forms/Config/Authentication/LdapBackendForm.php application/forms/Config/Authentication/ReorderForm.php application/forms/Config/LoggingForm.php application/forms/Config/ResourceForm.php application/forms/Preference/GeneralForm.php library/Icinga/Application/Config.php library/Icinga/Web/Form.php modules/monitoring/application/controllers/ConfigController.php modules/monitoring/application/forms/Config/Backend/CreateBackendForm.php modules/monitoring/application/forms/Config/Instance/CreateInstanceForm.php modules/monitoring/application/forms/Config/Instance/EditInstanceForm.php modules/monitoring/application/forms/Config/SecurityForm.php		2014-08-29 16:05:56 +02:00
..
clicommands	Throw IcingaException rather than Exception	2014-08-27 16:03:15 +02:00
controllers	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-08-29 16:05:56 +02:00
forms	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-08-29 16:05:56 +02:00
layouts/scripts	Change Menu load from config ini files to self provided configuration	2014-08-22 11:10:17 +02:00
locale	translation: refresh de_DE	2014-08-22 17:58:53 +02:00
views	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-08-29 16:05:56 +02:00