Florin Peter 690bf9b8c4 Merge branch 'master' into remove_unused_vars ... Conflicts: apps/files_encryption/lib/util.php		2013-05-27 17:26:35 +02:00
..
capabilities.php	Add further capabilities to /cloud/capabilitites api call	2013-02-10 14:42:23 +01:00
crypt.php	remove unused varaibles	2013-05-27 15:31:26 +02:00
helper.php	no use the recoveryPassword var instead of accessing the POST array	2013-05-24 18:37:58 +02:00
keymanager.php	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00
proxy.php	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00
session.php	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00
stream.php	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00
util.php	Merge branch 'master' into remove_unused_vars	2013-05-27 17:26:35 +02:00