Bjoern Schiessle 16b484209c Merge branch 'master' into encryption_work_with_public_gallery ... Conflicts: apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/crypt.php		2013-11-21 10:33:37 +01:00
..
files	Fixed delete action to show error message as notification	2013-11-19 15:05:11 +01:00
files_encryption	Merge branch 'master' into encryption_work_with_public_gallery	2013-11-21 10:33:37 +01:00
files_external	Merge pull request #5897 from hkjolhede/master	2013-11-21 01:22:05 -08:00
files_sharing	[tx-robot] updated from transifex	2013-11-15 22:56:31 -05: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