server/apps/files_encryption/tests
Bjoern Schiessle 9fb71af988 Merge branch 'master' into encryption_enable_public_upload
Conflicts:
	apps/files_encryption/lib/helper.php
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/keymanager.php
2013-11-27 15:08:09 +01:00
..
binary rename folder to tests 2013-04-30 00:34:05 +02:00
crypt.php some small changes according to the review comments 2013-11-27 11:46:24 +01:00
encryption.key added users for tests 2013-05-26 20:44:15 +02:00
helper.php tests added 2013-11-15 16:49:50 +01:00
keymanager.php Merge branch 'master' into encryption_enable_public_upload 2013-11-27 15:08:09 +01:00
legacy-encrypted-text.txt added users for tests 2013-05-26 20:44:15 +02:00
proxy.php fix comment 2013-10-15 17:36:52 +02:00
share.php Merge pull request #4537 from owncloud/no-realpath 2013-08-22 01:50:31 -07:00
stream.php Merge pull request #4537 from owncloud/no-realpath 2013-08-22 01:50:31 -07:00
trashbin.php Merge pull request #4537 from owncloud/no-realpath 2013-08-22 01:50:31 -07:00
util.php remove debug output 2013-11-14 12:13:22 +01:00
webdav.php Merge pull request #4537 from owncloud/no-realpath 2013-08-22 01:50:31 -07:00
zeros rename folder to tests 2013-04-30 00:34:05 +02:00