Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again ... Conflicts: apps/files_encryption/tests/keymanager.php		2013-08-17 13:15:22 +02:00
..
capabilities.php	Add further capabilities to /cloud/capabilitites api call	2013-02-10 14:42:23 +01:00
crypt.php	Merge pull request #4352 from owncloud/encryption_clean_up	2013-08-17 04:10:15 -07:00
helper.php	Merge branch 'master' into decrypt_files_again	2013-08-17 13:15:22 +02:00
keymanager.php	added helper function to escape glob pattern	2013-07-05 16:03:20 +02:00
proxy.php	use path relative to data/	2013-07-30 10:14:17 +02:00
session.php	reformat code	2013-06-03 18:42:13 +02:00
stream.php	handle error if we can't handle the given path	2013-07-30 15:27:59 +02:00
util.php	Merge branch 'master' into decrypt_files_again	2013-08-17 13:15:22 +02:00