Florin Peter 8761242f52 Merge branch 'master' into files_encryption_upgrade_fix ... Conflicts: apps/files_encryption/appinfo/app.php		2013-05-31 20:34:43 +07:00
..
app.php	Merge branch 'master' into files_encryption_upgrade_fix	2013-05-31 20:34:43 +07:00
database.xml	changed recovery_enabled and migration_status columns to integer and fix tests	2013-05-20 00:38:23 +07:00
info.xml	increase version and add warning	2013-05-25 12:08:18 +07:00
routes.php	Add further capabilities to /cloud/capabilitites api call	2013-02-10 14:42:23 +07:00
spec.txt	fixed typos	2013-05-18 21:12:53 +07:00
version	increase version and add warning	2013-05-25 12:08:18 +07:00