Permalink
Browse files

Merge branch 'feature/upgrade_jquery_171' of https://github.com/cerit…

…ium/fulcrum into ceritium-feature/upgrade_jquery_171
  • Loading branch information...
malclocke committed Feb 18, 2012
2 parents c167632 + 0a8e889 commit 4e4974555b217a846602858c6e64ee3a52c94962
@@ -5,7 +5,7 @@
<%= csrf_meta_tag %>
<link rel="stylesheet" type="text/css" href="//ajax.googleapis.com/ajax/libs/jqueryui/1/themes/smoothness/jquery-ui.css">
<%= stylesheet_link_tag 'screen.css', :Media => 'screen, projection' %>
- <%= javascript_include_tag 'underscore.js', 'jquery-1.4.2.min',
+ <%= javascript_include_tag 'underscore.js', 'jquery-1.7.1.min',
'backbone.js', 'jquery-ui-1.8.11.custom.min', 'jquery.tmpl.min.js',
'jquery.gritter.min.js', 'jquery.scrollTo-min.js', 'backbone.rails',
'rails.js', 'date.format.js', 'bootstrap-twipsy.js', 'bootstrap-popover.js',
Oops, something went wrong.

0 comments on commit 4e49745

Please sign in to comment.