diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-02-06 10:03:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-06 10:03:23 +0100 |
| commit | f60e223d5741d3f20dee0215b283a84fcecbcc3e (patch) | |
| tree | 474749cbe6a64ea929bd9e1269fcf07ee854a05a | |
| parent | 5faf6f5186422c9da24e98d609e67d5a89604467 (diff) | |
| parent | 635aa23b8ca145c6e3f064af7002a7d218481b8e (diff) | |
| download | nextcloud-server-f60e223d5741d3f20dee0215b283a84fcecbcc3e.tar.gz nextcloud-server-f60e223d5741d3f20dee0215b283a84fcecbcc3e.zip | |
Merge pull request #14053 from nextcloud/fix/jstz_is_bundled
Do not load bundled jstimezonedetect
| -rw-r--r-- | apps/workflowengine/lib/AppInfo/Application.php | 2 | ||||
| -rw-r--r-- | core/templates/login.php | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/apps/workflowengine/lib/AppInfo/Application.php b/apps/workflowengine/lib/AppInfo/Application.php index 36e37e955ea..882ccad5638 100644 --- a/apps/workflowengine/lib/AppInfo/Application.php +++ b/apps/workflowengine/lib/AppInfo/Application.php @@ -59,8 +59,6 @@ class Application extends \OCP\AppFramework\App { 'systemtags/systemtagscollection', ]); - vendor_script('jsTimezoneDetect/jstz'); - script('workflowengine', [ 'admin', 'templates', diff --git a/core/templates/login.php b/core/templates/login.php index 3035d23da70..c85f32ba8e3 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -1,6 +1,5 @@ <?php /** @var $l \OCP\IL10N */ ?> <?php -vendor_script('jsTimezoneDetect/jstz'); script('core', 'merged-login'); use OC\Core\Controller\LoginController; |