Sam Tuke ff6f52d5ec Merge branch 'master' into files_encryption ... Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/crypt.php apps/files_encryption/lib/keymanager.php		2013-03-28 18:39:12 +01:00
..
app.php	Merge branch 'master' into files_encryption	2013-03-28 18:39:12 +01:00
database.xml	Improved folder creation code	2013-03-19 19:53:15 +01:00
info.xml	all unit files_encryption crypt unit tests now passing after merge	2012-10-17 16:35:19 +01:00
routes.php	Add further capabilities to /cloud/capabilitites api call	2013-02-10 14:42:23 +01:00
spec.txt	Updated specfile	2013-02-11 10:34:23 +00:00
version	Fixed many coding guidelines issues	2013-01-24 18:37:34 +00:00