Sam Tuke b95bc663af Merge branch 'master' into files_encryption-style-fixes ... Conflicts: apps/files_encryption/lib/crypt.php apps/files_encryption/lib/util.php		2013-02-09 11:52:11 +00:00
..
crypt.php	Merge branch 'master' into files_encryption-style-fixes	2013-02-09 11:52:11 +00:00
keymanager.php	Added comment	2013-02-06 18:24:35 +00:00
proxy.php	Fixed incompatibilities with filecache rewrite merge	2013-01-31 16:49:07 +00:00
session.php	Fixed comment typo, wrapped return value conditional on var assignment in session{}	2013-02-05 17:28:26 +00:00
stream.php	Fixed comment typo, wrapped return value conditional on var assignment in session{}	2013-02-05 17:28:26 +00:00
util.php	Fixed bug causing encrypted files to be doubly encrypted at login	2013-02-06 14:30:40 +00:00