diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2016-07-01 17:22:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-01 17:22:01 +0300 |
| commit | 7e4366ec860f9a03c1607364bb9c1d1d7997ccc1 (patch) | |
| tree | 2a7c6e004ea0ce9c7116427502d407aa3920da17 /core | |
| parent | 6e3bf06c1d79b4cdb1d59cef63294c21b17cd0de (diff) | |
| parent | 497c3fbfd7863b160bd5b3b184e2c2892adbf80b (diff) | |
Merge pull request #244 from nextcloud/theming-app-stable9
[stable9] theming app
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/config.php | 2 | ||||
| -rw-r--r-- | core/shipped.json | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/js/config.php b/core/js/config.php index 921f35b59db..1292a959c62 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -47,7 +47,7 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); $l = \OC::$server->getL10N('core'); // Enable OC_Defaults support -$defaults = new OC_Defaults(); +$defaults = \OC::$server->getThemingDefaults(); // Get the config $apps_paths = array(); diff --git a/core/shipped.json b/core/shipped.json index 8c8aad5243d..eb1a0ab7899 100644 --- a/core/shipped.json +++ b/core/shipped.json @@ -31,6 +31,7 @@ "sharepoint", "systemtags", "templateeditor", + "theming", "updatenotification", "user_external", "user_ldap", |