Vincent Petry 1abe5b0408 Merge pull request #25024 from owncloud/ldap-cachedgroupsbymember ... Use array_merge when reading cached groups members		2016-06-10 11:06:41 +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-10 05:55:19 +00:00
lib	Use array_merge when reading cached groups members	2016-06-08 11:22:01 +02:00
templates	wording in LDAP wizard	2016-05-04 17:25:44 +01:00
tests	Add unit test for LDAP multi group caching	2016-06-09 17:57:07 +02:00
vendor/ui-multiselect	…
settings.php	Update license headers	2016-05-26 19:57:24 +02:00