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
..
helpers	Remove leading backslashes from the targets of use statements	2014-08-27 15:51:49 +02:00
scripts	Merge branch 'master' into bugfix/rebuild-form-builder-5525	2014-08-29 16:05:56 +02:00