aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-11-04 12:51:29 +0100
committerMorris Jobke <hey@morrisjobke.de>2014-11-04 14:28:29 +0100
commit74d375d8ea785e304dd679cc677568bdbf4a4caf (patch)
treec686c5569e8447f3614994bee09792983d3dfcc7 /lib
parentd5c98add589ce71aed5ac9973e4a000e9d95aab5 (diff)
downloadnextcloud-server-74d375d8ea785e304dd679cc677568bdbf4a4caf.tar.gz
nextcloud-server-74d375d8ea785e304dd679cc677568bdbf4a4caf.zip
migrate jQuery to bower
Diffstat (limited to 'lib')
-rw-r--r--lib/base.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php
index 11c5167786d..2b4ba7bcb4a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -327,8 +327,8 @@ class OC {
public static function initTemplateEngine() {
// Add the stuff we need always
// TODO: read from core/js/core.json
- OC_Util::addScript("jquery-1.10.0.min");
- OC_Util::addScript("jquery-migrate-1.2.1.min");
+ OC_Util::addVendorScript('jquery/jquery.min');
+ OC_Util::addVendorScript('jquery/jquery-migrate.min');
OC_Util::addScript("jquery-ui-1.10.0.custom");
OC_Util::addScript("jquery-showpassword");
OC_Util::addScript("placeholders");