summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-03-24 15:38:29 -0600
committerGitHub <noreply@github.com>2017-03-24 15:38:29 -0600
commit8aedebff22b99e569735946ea709c6f0c1e4459d (patch)
tree4cfe1c29dd8dc06b157fb00ea7bee22008526cf2 /core/js
parent4f73911bab1e8f4614104b751eda0ad4834e7c5e (diff)
parent6a4fde11e63f7168b0cceb55f1d805d19e13f56f (diff)
downloadnextcloud-server-8aedebff22b99e569735946ea709c6f0c1e4459d.tar.gz
nextcloud-server-8aedebff22b99e569735946ea709c6f0c1e4459d.zip
Merge pull request #4044 from nextcloud/merge-login-js
Merge login JS
Diffstat (limited to 'core/js')
-rw-r--r--core/js/merged-login.json5
1 files changed, 5 insertions, 0 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"
+]