Sam Tuke ff6f52d5ec Merge branch 'master' into files_encryption ... Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/keymanager.php		2013-03-28 18:39:12 +01:00
..
capabilities.php	Add further capabilities to /cloud/capabilitites api call	2013-02-10 14:42:23 +01:00
crypt.php	Fixed stream wrapper bugs	2013-03-09 19:18:34 +01:00
keymanager.php	Merge branch 'master' into files_encryption	2013-03-28 18:39:12 +01:00
proxy.php	check for dir in deleteFileKey() and delShareKey(), to always handle all share keys and file keys on delete	2013-03-26 16:52:58 +01:00
session.php	remove debug output, fix typo in file names	2013-02-14 16:33:57 +01:00
stream.php	Merge branch 'master' into files_encryption	2013-03-28 18:39:12 +01:00
util.php	move getUidAndFilename() tu util.php	2013-03-26 12:39:55 +01:00