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
..
capabilities.php	Add further capabilities to /cloud/capabilitites api call	2013-02-10 14:42:23 +01:00
crypt.php	changed to public log api	2013-05-27 20:51:52 +02:00
helper.php	Merge branch 'master' into remove_unused_vars	2013-05-28 11:00:49 +02:00
keymanager.php	changed to public log api	2013-05-27 20:51:52 +02:00
proxy.php	Merge branch 'master' into remove_unused_vars	2013-05-29 09:21:00 +02:00
session.php	Merge branch 'master' into remove_unused_vars	2013-05-29 09:21:00 +02:00
stream.php	Merge branch 'master' into remove_unused_vars	2013-05-29 09:21:00 +02:00
util.php	Merge branch 'master' into file_encryption_external_storage_fixes	2013-05-30 00:45:29 +02:00