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	…
img	…
js/wizard	…
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	…
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