Björn Schießle 27fcdb3af5 Merge branch 'master' into files_encryption_upgrade_fix ...

Conflicts:
	apps/files_encryption/tests/crypt.php

2013-06-12 20:53:45 +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_upgrade_fix

2013-06-12 20:53:45 +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