Bjoern Schiessle e5c84488ff Merge branch 'files_encryption' of gitorious.org:owncloud/owncloud into files_encryption ... Conflicts: apps/files_encryption/lib/keymanager.php		2012-07-26 14:06:39 +02:00
..
crypt.php	function to ask for the encryption mode (server side or client side).	2012-07-26 13:47:43 +02:00
cryptstream.php	fix saved file size for uploaded files	2012-06-21 18:22:18 +02:00
keymanager.php	Merge branch 'files_encryption' of gitorious.org:owncloud/owncloud into files_encryption	2012-07-26 14:06:39 +02:00
proxy.php	Mainly work on implementing new encryption system (+ keyfile handling) into proxy classs	2012-07-25 18:28:56 +01:00
util.php	Mainly work on implementing new encryption system (+ keyfile handling) into proxy classs	2012-07-25 18:28:56 +01:00