Florin Peter 1bfe975938 Merge branch 'master' into files_encryption_upgrade_fix ... Conflicts: apps/files_encryption/lib/util.php		2013-05-31 12:58:12 +02:00
..
capabilities.php	Add further capabilities to /cloud/capabilitites api call	2013-02-10 14:42:23 +01:00
crypt.php	use legacyDecrypt to decrypt key file like the previous files_encryption	2013-05-31 01:35:48 +02:00
helper.php	fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files	2013-05-30 01:13:22 +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	Merge branch 'master' into remove_unused_vars	2013-05-29 09:21:00 +02:00
stream.php	Merge branch 'master' into remove_unused_vars	2013-05-29 09:21:00 +02:00
util.php	Merge branch 'master' into files_encryption_upgrade_fix	2013-05-31 12:58:12 +02:00