aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/js/merged-login.json5
-rw-r--r--core/templates/login.php6
2 files changed, 6 insertions, 5 deletions
diff --git a/core/js/merged-login.json b/core/js/merged-login.json
new file mode 100644
index 00000000000..5aea3f8e157
--- /dev/null
+++ b/core/js/merged-login.json
@@ -0,0 +1,5 @@
+[
+ "visitortimezone.js",
+ "lostpassword.js",
+ "login.js"
+]
diff --git a/core/templates/login.php b/core/templates/login.php
index 352893bd0dc..8545e5d07df 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,11 +1,7 @@
<?php /** @var $l \OCP\IL10N */ ?>
<?php
vendor_script('jsTimezoneDetect/jstz');
-script('core', [
- 'visitortimezone',
- 'lostpassword',
- 'login'
-]);
+script('core', 'merged-login');
?>
<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->