Thomas Müller dad91c156f Merge branch 'master' into fixing-3942-master ... Conflicts: apps/files/ajax/upload.php		2013-07-06 00:02:11 +02:00
..
files	Merge branch 'master' into fixing-3942-master	2013-07-06 00:02:11 +02:00
files_encryption	remove wrong closing bracket	2013-07-05 16:05:05 +02:00
files_external	[tx-robot] updated from transifex	2013-07-04 09:33:58 +02:00
files_sharing	Merge branch 'master' into fixing-3942-master	2013-07-06 00:02:11 +02:00
files_trashbin	make trash bin aware of system wide mounts with respect to encryption keys	2013-07-05 16:00:25 +02:00
files_versions	[tx-robot] updated from transifex	2013-06-20 02:43:39 +02:00
user_ldap	[tx-robot] updated from transifex	2013-06-29 02:09:10 +02:00
user_webdavauth	[tx-robot] updated from transifex	2013-07-02 15:35:55 +02:00