Robin Appelman 729210daa0 Merge branch 'master' into memcache-public ... Conflicts: apps/user_ldap/lib/connection.php		2014-01-15 13:02:15 +01:00
..
l10n	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
private	Merge branch 'master' into memcache-public	2014-01-15 13:02:15 +01:00
public	Merge branch 'master' into memcache-public	2014-01-09 13:54:58 +01:00
autoloader.php	Allow null as cache parameter (if no cache was found) and for cache removal.	2013-10-22 11:17:15 +02:00
base.php	rename user-id to loginname to stay consistent	2014-01-09 10:29:21 +01:00