summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption/appinfo
diff options
context:
space:
mode:
authorTom Needham <tom@owncloud.com>2013-03-05 00:25:56 +0000
committerTom Needham <tom@owncloud.com>2013-03-05 00:25:56 +0000
commit370f202251df2425ec49c78265859a804a88433f (patch)
tree75fa9d4d8694032dcb6e0987bc97ef379691e546 /apps/files_encryption/appinfo
parentf141f8b523f71351841f64ab1e4782b4535ca1b7 (diff)
parentef70978524ad0f00c3e5f03a489753547afee45a (diff)
downloadnextcloud-server-370f202251df2425ec49c78265859a804a88433f.tar.gz
nextcloud-server-370f202251df2425ec49c78265859a804a88433f.zip
Rebase to current master
Diffstat (limited to 'apps/files_encryption/appinfo')
-rw-r--r--apps/files_encryption/appinfo/app.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 3c100b4957d..3bdf6829a9b 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -13,7 +13,7 @@ OC_FileProxy::register( new OCA\Encryption\Proxy() );
// User-related hooks
OCP\Util::connectHook( 'OC_User', 'post_login', 'OCA\Encryption\Hooks', 'login' );
-OCP\Util::connectHook( 'OC_User', 'pre_setPassword','OCA\Encryption\Hooks', 'setPassphrase' );
+OCP\Util::connectHook( 'OC_User', 'pre_setPassword', 'OCA\Encryption\Hooks', 'setPassphrase' );
// Sharing-related hooks
OCP\Util::connectHook( 'OCP\Share', 'post_shared', 'OCA\Encryption\Hooks', 'postShared' );
@@ -44,6 +44,6 @@ if (
}
-// Reguster settings scripts
+// Register settings scripts
OCP\App::registerAdmin( 'files_encryption', 'settings' );
-OCP\App::registerPersonal( 'files_encryption', 'settings-personal' ); \ No newline at end of file
+OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );