Sam Tuke 82f5f73dff Merge commit '84fd62b13047cb756d9f39c192e17fd5f2179f83' into files_encryption ... Conflicts: apps/files_encryption/lib/crypt.php		2012-07-31 19:38:28 +01:00
..
crypt.php	Merge commit '84fd62b13047cb756d9f39c192e17fd5f2179f83' into files_encryption	2012-07-31 19:38:28 +01:00
cryptstream.php	Implemented writing of keyfiles and directory hierarchy in proxy class	2012-07-31 19:35:36 +01:00
keymanager.php	Implemented writing of keyfiles and directory hierarchy in proxy class	2012-07-31 19:35:36 +01:00
proxy.php	Implemented writing of keyfiles and directory hierarchy in proxy class	2012-07-31 19:35:36 +01:00
util.php	Implemented writing of keyfiles and directory hierarchy in proxy class	2012-07-31 19:35:36 +01:00