diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-08-23 09:16:20 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-08-23 09:16:20 -0700 |
| commit | 3e1a96cabb228b59021676772daca23b22a026c7 (patch) | |
| tree | 3ba1cdf9a9d271c39bceac8b8d5c2b78e0d61977 /views/installation/page | |
| parent | 8dc4ca48d1ff5c3800637a463a7b072fb253634e (diff) | |
| parent | 5ac7727c36392633dc7d1d4a79ee3c5086bd37b6 (diff) | |
| download | elgg-3e1a96cabb228b59021676772daca23b22a026c7.tar.gz elgg-3e1a96cabb228b59021676772daca23b22a026c7.tar.bz2 | |
Merge branch 'master' of github.com:Elgg/Elgg
Conflicts:
engine/lib/views.php
Diffstat (limited to 'views/installation/page')
| -rw-r--r-- | views/installation/page/default.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/views/installation/page/default.php b/views/installation/page/default.php index a41a5b688..10499ed27 100644 --- a/views/installation/page/default.php +++ b/views/installation/page/default.php @@ -29,7 +29,7 @@ header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', TRUE); <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>_graphics/favicon.ico" /> <link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>install/css/install.css" type="text/css" /> - <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.5.min.js"></script> + <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery-1.6.2.min.js"></script> <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>install/js/install.js"></script> </head> <body> |