Thomas Mueller bc43dd704f Merge branch 'master' into fixing-1424-master ... Conflicts: settings/js/users.js		2013-02-13 01:18:01 +01:00
..
files	[tx-robot] updated from transifex	2013-02-13 00:05:40 +01:00
files_encryption	[tx-robot] updated from transifex	2013-02-13 00:05:40 +01:00
files_external	user name and password need to be encoded as well	2013-02-12 15:56:31 +01:00
files_sharing	Share: fix table head color for public shared folders	2013-02-11 12:35:39 +01:00
files_trashbin	[tx-robot] updated from transifex	2013-02-13 00:05:40 +01:00
files_versions	[tx-robot] updated from transifex	2013-02-13 00:05:40 +01:00
user_ldap	Merge branch 'master' into fixing-1424-master	2013-02-13 01:18:01 +01:00
user_webdavauth	Merge branch 'master' into fixing-1424-master	2013-02-13 01:18:01 +01:00