Björn Schießle 7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key ... Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php		2013-06-13 13:17:35 +02:00
..
binary	rename folder to tests	2013-04-30 00:34:05 +02:00
crypt.php	Merge branch 'master' into files_encryption_check_private_key	2013-06-13 13:17:35 +02:00
encryption.key	added users for tests	2013-05-26 20:44:15 +02:00
keymanager.php	add timeouts 3/30/90 to phpunit tests	2013-06-10 09:31:22 +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	Merge branch 'master' into files_encryption_check_private_key	2013-06-11 15:19:02 +02:00
stream.php	raise failed tests from first commit to size @medium	2013-06-10 10:17:47 +02:00
trashbin.php	allow 30 sec for testDeleteFile	2013-06-10 14:45:39 +02:00
util.php	Merge branch 'master' into files_encryption_upgrade_fix	2013-06-13 12:53:29 +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