Johannes Meyer 9d292269b1 Merge branch 'master' into feature/setup-wizard-7163 ... Conflicts: application/forms/Config/Resource/LdapResourceForm.php test/php/application/forms/Config/Authentication/LdapBackendFormTest.php		2014-11-11 09:44:11 +01:00
..
files	Use arrays in the Icinga 2 example config	2014-11-05 09:49:59 +01:00
manifests	Update documentation and fix vagrant manifest due to moved schema files	2014-10-08 08:52:04 +02:00
modules	Update deprecated output variable in puppet files	2014-08-20 15:16:42 +02:00
.gitattributes	Make sure line-endings for Puppet manifests are LFs only.	2014-05-10 09:34:21 +02:00