aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/views.php
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-08-23 09:16:20 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-08-23 09:16:20 -0700
commit3e1a96cabb228b59021676772daca23b22a026c7 (patch)
tree3ba1cdf9a9d271c39bceac8b8d5c2b78e0d61977 /engine/lib/views.php
parent8dc4ca48d1ff5c3800637a463a7b072fb253634e (diff)
parent5ac7727c36392633dc7d1d4a79ee3c5086bd37b6 (diff)
downloadelgg-3e1a96cabb228b59021676772daca23b22a026c7.tar.gz
elgg-3e1a96cabb228b59021676772daca23b22a026c7.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
Conflicts: engine/lib/views.php
Diffstat (limited to 'engine/lib/views.php')
-rw-r--r--engine/lib/views.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php
index c0802b0ad..7686a8bef 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -1548,8 +1548,8 @@ function elgg_views_boot() {
elgg_register_simplecache_view('css/ie6');
elgg_register_simplecache_view('js/elgg');
- elgg_register_js('jquery', '/vendors/jquery/jquery-1.6.1.min.js', 'head', 0);
- elgg_register_js('jquery-ui', '/vendors/jquery/jquery-ui-1.8.14.min.js', 'head', 1);
+ elgg_register_js('jquery', '/vendors/jquery/jquery-1.6.2.min.js', 'head', 1);
+ elgg_register_js('jquery-ui', '/vendors/jquery/jquery-ui-1.8.16.min.js', 'head', 2);
elgg_register_js('jquery.form', '/vendors/jquery/jquery.form.js');
elgg_load_js('jquery');
elgg_load_js('jquery-ui');