Björn Schießle 2c3c60c1af Merge branch 'master' into remove_unused_vars ... Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/proxy.php		2013-05-27 18:09:35 +02:00
..
capabilities.php	Add further capabilities to /cloud/capabilitites api call	2013-02-10 14:42:23 +01:00
crypt.php	Merge branch 'master' into remove_unused_vars	2013-05-27 18:09:35 +02:00
helper.php	reformat code	2013-05-27 17:26:58 +02:00
keymanager.php	reformat code	2013-05-27 17:26:58 +02:00
proxy.php	Merge branch 'master' into remove_unused_vars	2013-05-27 18:09:35 +02:00
session.php	reformat code	2013-05-27 17:26:58 +02:00
stream.php	reformat code	2013-05-27 17:26:58 +02:00
util.php	Merge branch 'master' into remove_unused_vars	2013-05-27 17:26:35 +02:00