diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-03-28 21:39:12 +0400 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-03-28 21:39:12 +0400 |
| commit | ff6f52d5ec24a9c940f3e8b0dd2f731b1a42104e (patch) | |
| tree | dfe4d38b0df8c91b9fd9a5189098590d102d1557 /apps/files_encryption/settings-personal.php | |
| parent | 9ecfd07f23e7fe2924bee6103792c00c6ec3cb0a (diff) | |
| parent | df31ee5a903efb288dcb217dc13591a4efd46572 (diff) | |
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
Diffstat (limited to 'apps/files_encryption/settings-personal.php')
| -rw-r--r-- | apps/files_encryption/settings-personal.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php index 94e37ebe96b..c001bb0d725 100644 --- a/apps/files_encryption/settings-personal.php +++ b/apps/files_encryption/settings-personal.php @@ -12,8 +12,6 @@ $blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_b $tmpl->assign( 'blacklist', $blackList );
-OCP\Util::addscript('files_encryption','settings-personal');
-
return $tmpl->fetchPage();
return null;
|