From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 5 Nov 2014 15:43:24 +0000 (+0100)
Subject: Merge pull request #11936 from owncloud/bower-jquery
X-Git-Tag: v8.0.0alpha1~366
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4659b0e6a0ed69238d684b5dff4a745dc02781e2;p=nextcloud-server.git

Merge pull request #11936 from owncloud/bower-jquery

Bower jquery
---

4659b0e6a0ed69238d684b5dff4a745dc02781e2
diff --cc core/js/core.json
index 2fc821b0416,86db15e5116..137e0217a6f
--- a/core/js/core.json
+++ b/core/js/core.json
@@@ -3,10 -5,9 +5,8 @@@
  		"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.placeholder.js",
  		"jquery-tipsy.js",
  		"underscore.js"
  	],