Björn Schießle 3fc5b34247 Merge branch 'master' into encryption_check_php_version ... Conflicts: apps/files_encryption/files/error.php		2013-07-02 13:54:31 +02:00
..
files	Merge pull request #3903 from owncloud/nonpublic-uploading	2013-07-01 12:35:32 -07:00
files_encryption	Merge branch 'master' into encryption_check_php_version	2013-07-02 13:54:31 +02:00
files_external	[tx-robot] updated from transifex	2013-06-20 02:43:39 +02:00
files_sharing	add logo claim to defaults.php	2013-07-01 10:48:13 +02:00
files_trashbin	[tx-robot] updated from transifex	2013-06-25 02:13:40 +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-06-29 02:09:10 +02:00