Björn Schießle 99c62dfd76 Merge branch 'master' into fix_glob_escaping ... Conflicts: apps/files_trashbin/lib/trash.php		2013-06-17 14:51:08 +02:00
..
files	[tx-robot] updated from transifex	2013-06-14 02:52:34 +02:00
files_encryption	[tx-robot] updated from transifex	2013-06-17 02:08:11 +02:00
files_external	[tx-robot] updated from transifex	2013-06-14 02:52:34 +02:00
files_sharing	[tx-robot] updated from transifex	2013-06-14 02:52:34 +02:00
files_trashbin	Merge branch 'master' into fix_glob_escaping	2013-06-17 14:51:08 +02:00
files_versions	don't normalize absolute local path	2013-06-17 14:42:18 +02:00
user_ldap	[tx-robot] updated from transifex	2013-06-14 02:52:34 +02:00
user_webdavauth	[tx-robot] updated from transifex	2013-06-17 02:08:11 +02:00