Thomas Müller 4f25f34178 Merge pull request #22778 from owncloud/fix-22770 ... untangle different user manager instances, fixes #22770		2016-03-03 11:55:10 +01:00
..
ajax	Update author information	2016-03-01 17:25:15 +01:00
appinfo	Increase all versions on master which is now 9.1	2016-03-02 08:53:42 +01:00
command	Happy new year!	2016-01-12 15:02:18 +01:00
css	make all the buttons beautiful	2015-11-05 16:32:07 +01:00
img	LDAP Wizard Overhaul	2015-04-09 09:47:49 +02:00
js/wizard	Fix race condition when switching filter mode. Fixes #22278	2016-02-12 21:51:06 +01:00
l10n	[tx-robot] updated from transifex	2016-03-03 01:56:04 -05:00
lib	untangle different user manager instances, fixes #22770	2016-03-02 13:02:43 +01:00
templates	Merge pull request #22102 from owncloud/ldap_2nddispname-master	2016-02-06 13:27:01 +01:00
tests	Update author information	2016-03-01 17:25:15 +01:00
vendor/ui-multiselect	Migrate multiselect to user_ldap	2014-11-13 00:47:14 +01:00
group_ldap.php	Update author information	2016-03-01 17:25:15 +01:00
group_proxy.php	Happy new year!	2016-01-12 15:02:18 +01:00
settings.php	Happy new year!	2016-01-12 15:02:18 +01:00
user_ldap.php	Remove Scrutinizer Auto Fixer	2016-03-01 17:48:23 +01:00
user_proxy.php	Happy new year!	2016-01-12 15:02:18 +01:00