Björn Schießle 20ddd6e1c7 Merge branch 'master' into files_encryption_check_private_key ... Conflicts: apps/files_encryption/tests/crypt.php		2013-06-11 15:19:02 +02:00
..
files	[tx-robot] updated from transifex	2013-06-08 02:13:41 +02:00
files_encryption	Merge branch 'master' into files_encryption_check_private_key	2013-06-11 15:19:02 +02:00
files_external	[tx-robot] updated from transifex	2013-06-07 02:17:50 +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