Lukas Reschke 2b493e2f9d Merge remote-tracking branch 'upstream/master' into master-sync-upstream		2016-06-21 11:18:22 +02:00
..
ajax	Update license headers	2016-05-26 19:57:24 +02:00
appinfo	Update license headers	2016-05-26 19:57:24 +02:00
css	Design LDAP wizard to better integrate into the design	2016-03-30 15:24:14 +02:00
img	LDAP Wizard Overhaul	2015-04-09 09:47:49 +02:00
js/wizard	LDAP Wizard: reset connection status indicator when switching LDAP config	2016-04-25 16:24:44 +02:00
l10n	[tx-robot] updated from transifex	2016-06-14 08:02:15 +02:00
lib	Use proper namespaces - fixes #25078 (#25079)	2016-06-13 19:32:54 +02:00
templates	fix more strings	2016-06-20 13:14:24 +02:00
tests	Add unit test for LDAP multi group caching	2016-06-09 17:57:07 +02:00
vendor/ui-multiselect	Migrate multiselect to user_ldap	2014-11-13 00:47:14 +01:00
settings.php	Update license headers	2016-05-26 19:57:24 +02:00