Björn Schießle 7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key ... Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php		2013-06-13 13:17:35 +02:00
..
capabilities.php	Add further capabilities to /cloud/capabilitites api call	2013-02-10 14:42:23 +01:00
crypt.php	Merge branch 'master' into files_encryption_check_private_key	2013-06-13 13:17:35 +02:00
helper.php	Merge branch 'master' into files_encryption_check_private_key	2013-06-10 12:12:07 +02:00
keymanager.php	added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp'	2013-05-30 22:07:36 +02:00
proxy.php	Merge branch 'master' into files_encryption_upgrade_fix	2013-05-31 12:58:12 +02:00
session.php	reformat code	2013-06-03 18:42:13 +02:00
stream.php	changed redirect handling	2013-06-03 23:41:57 +02:00
util.php	Merge branch 'master' into files_encryption_check_private_key	2013-06-13 13:17:35 +02:00