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
..
capabilities.php	Add _many_ newlines at the end of files	2013-08-18 11:06:59 +02:00
crypt.php	block file access if share keys are missing	2013-10-11 14:20:46 +02:00
helper.php	Merge branch 'master' into encryption_enable_public_upload	2013-11-27 15:08:09 +01:00
keymanager.php	Merge branch 'master' into encryption_enable_public_upload	2013-11-27 15:08:09 +01:00
proxy.php	Merge branch 'master' into encryption_enable_public_upload	2013-11-27 15:08:09 +01:00
session.php	no longer enforce log out, but provide useful errors/warnings instead	2013-09-06 12:27:40 +02:00
stream.php	Merge branch 'master' into encryption_enable_public_upload	2013-11-27 15:08:09 +01:00
util.php	Merge branch 'master' into encryption_enable_public_upload	2013-11-27 15:08:09 +01:00