Merge pull request #14053 from nextcloud/fix/jstz_is_bundled

Do not load bundled jstimezonedetect
2019-02-06 10:03:23 +01:00 · 2019-02-06 10:03:23 +01:00 · f60e223d57
parent 5faf6f5186 635aa23b8c
commit f60e223d57
2 changed files with 0 additions and 3 deletions
--- 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',
--- 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;