Björn Schießle 4d4484fac1 Merge pull request #3870 from owncloud/reset_migration_status ... introduce pre-disable-app hook and first usage in files_encryption		2013-07-02 07:26:48 -07:00
..
3rdparty/Crypt_Blowfish
ajax
appinfo	introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled	2013-06-27 14:09:22 +02:00
css
files	improved error message	2013-07-02 10:11:42 +02:00
hooks	introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled	2013-06-27 14:09:22 +02:00
js
l10n	[tx-robot] updated from transifex	2013-07-02 15:35:55 +02:00
lib	Merge pull request #3870 from owncloud/reset_migration_status	2013-07-02 07:26:48 -07:00
templates	fix some strings in the admin settings, it's not a 'recovery account' but a 'recovery key'	2013-06-21 14:49:01 +02:00
tests	Merge branch 'master' into files_encryption_check_private_key	2013-06-13 13:17:35 +02:00
settings-admin.php
settings-personal.php