Bjoern Schiessle 18c80e47b6 Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload ... Conflicts: apps/files_encryption/lib/stream.php		2013-11-21 10:24:47 +01:00
..
files	public upload now also works with encryption enabled	2013-11-21 00:23:38 +01:00
files_encryption	Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload	2013-11-21 10:24:47 +01:00
files_external	Fixed SMB file deletion success detection	2013-11-19 15:05:11 +01:00
files_sharing	public upload now also works with encryption enabled	2013-11-21 00:23:38 +01:00
files_trashbin	[tx-robot] updated from transifex	2013-11-15 22:56:31 -05:00
files_versions	[tx-robot] updated from transifex	2013-11-15 22:56:31 -05:00
user_ldap	[tx-robot] updated from transifex	2013-11-15 22:56:31 -05:00
user_webdavauth	[tx-robot] updated from transifex	2013-11-15 22:56:31 -05:00