summaryrefslogtreecommitdiffstats
path: root/core/js/core.json
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2014-11-05 16:43:24 +0100
committerLukas Reschke <lukas@owncloud.com>2014-11-05 16:43:24 +0100
commit4659b0e6a0ed69238d684b5dff4a745dc02781e2 (patch)
tree9fca52cc48124243e749735e47277a551cf73713 /core/js/core.json
parent9dc769c37a3a95830ad7a8d9534e8b05e8efb6f3 (diff)
parent2c941729eea47529fe687cea391240186b0f83c0 (diff)
downloadnextcloud-server-4659b0e6a0ed69238d684b5dff4a745dc02781e2.tar.gz
nextcloud-server-4659b0e6a0ed69238d684b5dff4a745dc02781e2.zip
Merge pull request #11936 from owncloud/bower-jquery
Bower jquery
Diffstat (limited to 'core/js/core.json')
-rw-r--r--core/js/core.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/core.json b/core/js/core.json
index 2fc821b0416..137e0217a6f 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -1,10 +1,10 @@
{
"vendor": [
+ "jquery/jquery.min.js",
+ "jquery/jquery-migrate.min.js",
"moment/min/moment-with-locales.js"
],
"libraries": [
- "jquery-1.10.0.min.js",
- "jquery-migrate-1.2.1.min.js",
"jquery-ui-1.10.0.custom.js",
"jquery-showpassword.js",
"jquery-tipsy.js",