Bjoern Schiessle 9fb71af988 Merge branch 'master' into encryption_enable_public_upload ... Conflicts: apps/files_encryption/lib/helper.php apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/keymanager.php		2013-11-27 15:08:09 +01:00
..
files	Merge branch 'master' into encryption_enable_public_upload	2013-11-27 15:08:09 +01:00
files_encryption	Merge branch 'master' into encryption_enable_public_upload	2013-11-27 15:08:09 +01:00
files_external	Fixed SFTP storage to overwrite on rename	2013-11-26 16:32:44 +01:00
files_sharing	Merge branch 'master' into encryption_enable_public_upload	2013-11-27 15:08:09 +01:00
files_trashbin	Merge pull request #5641 from owncloud/filestrash-emptytrash	2013-11-25 05:24:11 -08:00
files_versions	remove unused variable	2013-11-22 16:10:30 +01:00
user_ldap	Merge pull request #5955 from owncloud/fix5863	2013-11-27 00:30:15 -08:00
user_webdavauth	[tx-robot] updated from transifex	2013-11-15 22:56:31 -05:00