Sam Tuke 82f5f73dff Merge commit '84fd62b13047cb756d9f39c192e17fd5f2179f83' into files_encryption ... Conflicts: apps/files_encryption/lib/crypt.php		2012-07-31 19:38:28 +01:00
..
appinfo	update file encryption key over webdav properties for client side encryption	2012-07-31 15:03:28 +02:00
hooks	Implemented writing of keyfiles and directory hierarchy in proxy class	2012-07-31 19:35:36 +01:00
js	allow admin to choose between client and server side encryption	2012-07-31 16:37:37 +02:00
lib	Merge commit '84fd62b13047cb756d9f39c192e17fd5f2179f83' into files_encryption	2012-07-31 19:38:28 +01:00
templates	allow admin to choose between client and server side encryption	2012-07-31 16:37:37 +02:00
tests	added tests and methods relating to handling of legacy keys	2012-07-25 12:38:40 +01:00
settings.php	removing executable bit - again	2012-05-15 00:52:00 +02:00