diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2014-11-05 16:43:24 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2014-11-05 16:43:24 +0100 |
| commit | 4659b0e6a0ed69238d684b5dff4a745dc02781e2 (patch) | |
| tree | 9fca52cc48124243e749735e47277a551cf73713 /lib | |
| parent | 9dc769c37a3a95830ad7a8d9534e8b05e8efb6f3 (diff) | |
| parent | 2c941729eea47529fe687cea391240186b0f83c0 (diff) | |
| download | nextcloud-server-4659b0e6a0ed69238d684b5dff4a745dc02781e2.tar.gz nextcloud-server-4659b0e6a0ed69238d684b5dff4a745dc02781e2.zip | |
Merge pull request #11936 from owncloud/bower-jquery
Bower jquery
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 4 |
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"); |