Robin Appelman 729210daa0 Merge branch 'master' into memcache-public ... Conflicts: apps/user_ldap/lib/connection.php		2014-01-15 13:02:15 +01:00
..
files	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
files_encryption	[tx-robot] updated from transifex	2014-01-08 01:55:41 -05:00
files_external	Merge pull request #6759 from owncloud/extstorage-smbtimezonefix	2014-01-14 06:03:24 -08:00
files_sharing	it is not an urgent error... a DEBUG message is enough at this point	2014-01-14 13:38:41 +01:00
files_trashbin	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
files_versions	call getFileInfo to enforce a file cache entry for the new version, fix #6286	2014-01-15 11:37:47 +01:00
user_ldap	Merge branch 'master' into memcache-public	2014-01-15 13:02:15 +01:00
user_webdavauth	[tx-robot] updated from transifex	2014-01-04 01:55:57 -05:00