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

..

Ini

Merge branch 'master' into feature/setup-wizard-7163

2014-11-11 09:44:11 +01:00

Csv.php

CSV/JSON export: work with new query interfaces

2014-06-21 00:09:11 +02:00

Pdf.php

Remove license headers from all files

2014-07-15 13:43:52 +02:00