diff options
author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-05-30 06:00:52 -0700 |
---|---|---|
committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-05-30 06:00:52 -0700 |
commit | 476747ee892c0a97ca37547046189e4da5ffd573 (patch) | |
tree | dd28dad9382101eef34ee3ebdb7983d83f52f50a /lib/base.php | |
parent | aa1c5a5d63865fc35783dbbff3af0cc64a1bb4cf (diff) | |
parent | 3001db6b50c44d78b9f3eaf947b9a680c8b81dc5 (diff) | |
download | nextcloud-server-476747ee892c0a97ca37547046189e4da5ffd573.tar.gz nextcloud-server-476747ee892c0a97ca37547046189e4da5ffd573.zip |
Merge pull request #3509 from owncloud/update_jquery_to_1_10
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
Diffstat (limited to 'lib/base.php')
-rw-r--r-- | lib/base.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index f1145b651ae..9d1d4b5e058 100644 --- a/lib/base.php +++ b/lib/base.php @@ -258,7 +258,8 @@ class OC { public static function initTemplateEngine() { // Add the stuff we need always - OC_Util::addScript("jquery-1.7.2.min"); + OC_Util::addScript("jquery-1.10.0.min"); + OC_Util::addScript("jquery-migrate-1.2.1.min"); OC_Util::addScript("jquery-ui-1.10.0.custom"); OC_Util::addScript("jquery-showpassword"); OC_Util::addScript("jquery.infieldlabel"); |