mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14053 from nextcloud/fix/jstz_is_bundled 

Do not load bundled jstimezonedetect
This commit is contained in:
Morris Jobke 2019-02-06 10:03:23 +01:00 committed by GitHub
parent 5faf6f5186 635aa23b8c
commit f60e223d57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/workflowengine/lib/AppInfo/Application.php
View File

@ -59,8 +59,6 @@ class Application extends \OCP\AppFramework\App {
'systemtags/systemtagscollection', 'systemtags/systemtagscollection',
]); ]);
vendor_script('jsTimezoneDetect/jstz');
script('workflowengine', [ script('workflowengine', [
'admin', 'admin',
'templates', 'templates',

1
core/templates/login.php
View File

@ -1,6 +1,5 @@
<?php /** @var $l \OCP\IL10N */ ?> <?php /** @var $l \OCP\IL10N */ ?>
<?php <?php
vendor_script('jsTimezoneDetect/jstz');
script('core', 'merged-login'); script('core', 'merged-login');
use OC\Core\Controller\LoginController; use OC\Core\Controller\LoginController;