Björn Schießle 7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key ... Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php		2013-06-13 13:17:35 +02:00
..
files	Revert "FIX: Download of files named "true" or "false" impossible"	2013-06-12 18:30:28 +02:00
files_encryption	Merge branch 'master' into files_encryption_check_private_key	2013-06-13 13:17:35 +02:00
files_external	disable proxys during ssl root cert upload to avoid encryption	2013-06-12 10:37:09 +02:00
files_sharing	[tx-robot] updated from transifex	2013-06-05 02:01:42 +02:00
files_trashbin	[tx-robot] updated from transifex	2013-06-07 02:17:50 +02:00
files_versions	[tx-robot] updated from transifex	2013-06-08 02:13:41 +02:00
user_ldap	[tx-robot] updated from transifex	2013-06-11 02:02:44 +02:00
user_webdavauth	[tx-robot] updated from transifex	2013-06-07 02:17:50 +02:00