Johannes Meyer 99719bec7d Merge branch 'master' into bugfix/broken-user-and-group-management-10367 ... Conflicts: library/Icinga/Authentication/User/LdapUserBackend.php library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php		2015-10-29 08:52:07 +01:00
..
clicommands	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
controllers	user/list.phtml: Fix coding style, link targets, css, etc	2015-10-15 17:06:02 +02:00
fonts	Add icon-twitter and icon-facebook-squared	2015-10-01 00:56:12 +02:00
forms	Repair redirect after login	2015-10-22 16:57:01 +02:00
layouts/scripts	Merge branch 'master' into feature/dope-layout-5543	2015-10-01 21:29:35 +02:00
locale	locale: Update de_DE	2015-10-02 12:07:41 +02:00
views	user/list.phtml: Fix coding style, link targets, css, etc	2015-10-15 17:06:02 +02:00
VERSION	Revert "Rename application/VERSION to application/GITCOMMIT"	2015-09-30 18:37:48 +02:00