Björn Schießle 7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key ... Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php		2013-06-13 13:17:35 +02:00
..
app.php	Merge branch 'master' into files_encryption_check_private_key	2013-06-13 13:17:35 +02:00
database.xml	changed recovery_enabled and migration_status columns to integer and fix tests	2013-05-20 00:38:23 +02:00
info.xml	increase version and add warning	2013-05-25 12:08:18 +02:00
routes.php	Add further capabilities to /cloud/capabilitites api call	2013-02-10 14:42:23 +01:00
spec.txt	fixed typos	2013-05-18 21:12:53 +02:00
version	increase version and add warning	2013-05-25 12:08:18 +02:00