Florin Peter 313631edf6 Merge branch 'master' into file_encryption_external_storage_fixes ... Conflicts: apps/files_encryption/hooks/hooks.php		2013-05-30 00:45:29 +02:00
..
binary	rename folder to tests	2013-04-30 00:34:05 +02:00
crypt.php	Merge branch 'master' into remove_unused_vars	2013-05-29 09:21:00 +02:00
encryption.key	added users for tests	2013-05-26 20:44:15 +02:00
keymanager.php	added users for tests	2013-05-26 20:44:15 +02:00
legacy-encrypted-text.txt	added users for tests	2013-05-26 20:44:15 +02:00
proxy.php	rename folder to tests	2013-04-30 00:34:05 +02:00
share.php	added users for tests	2013-05-26 20:44:15 +02:00
stream.php	added users for tests	2013-05-26 20:44:15 +02:00
trashbin.php	added users for tests	2013-05-26 20:44:15 +02:00
util.php	Use the new session wrapper	2013-05-28 01:04:09 +02:00
webdav.php	Merge branch 'master' into file_encryption_external_storage_fixes	2013-05-30 00:45:29 +02:00
zeros	rename folder to tests	2013-04-30 00:34:05 +02:00