diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2014-03-31 21:38:54 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2014-03-31 21:38:54 +0200 |
| commit | 6b061c236dd5730837b567f2c39a19af1617d33c (patch) | |
| tree | 27de0d46deae2987ea398f2f2aee4e26786c6f48 /settings/settings.php | |
| parent | 8951328a87c16e5ebfe4d3e5c392347db1e54f92 (diff) | |
| parent | ab696edba685cd6d2a64c2e48907f03197aae53f (diff) | |
| download | nextcloud-server-6b061c236dd5730837b567f2c39a19af1617d33c.tar.gz nextcloud-server-6b061c236dd5730837b567f2c39a19af1617d33c.zip | |
Merge branch 'master' into type-hinting
Conflicts:
lib/private/image.php
lib/private/l10n.php
lib/private/request.php
lib/private/share/mailnotifications.php
lib/private/template/base.php
Diffstat (limited to 'settings/settings.php')
| -rw-r--r-- | settings/settings.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/settings/settings.php b/settings/settings.php index 1e05452ec4d..c08732fcf66 100644 --- a/settings/settings.php +++ b/settings/settings.php @@ -6,7 +6,6 @@ */ OC_Util::checkLoggedIn(); -OC_App::loadApps(); OC_Util::addStyle( 'settings', 'settings' ); OC_App::setActiveNavigationEntry( 'settings' ); |