Permalink
Browse files

Merge branch 'master' of https://github.com/stan/jquery-rails into st…

…an-master
  • Loading branch information...
JangoSteve committed Nov 26, 2011
2 parents 859e374 + f4608e2 commit 80406624c86f50ee449ad69891ade1579b221ac9
Showing with 295 additions and 329 deletions.
  1. +1 −1 README.md
  2. +1 −1 lib/jquery/rails/version.rb
  3. +289 −323 vendor/assets/javascripts/jquery.js
  4. +4 −4 vendor/assets/javascripts/jquery.min.js
View
@@ -4,7 +4,7 @@ jQuery! For Rails! So great.
This gem provides:
-* jQuery 1.7
+* jQuery 1.7.1
* jQuery UI 1.8.16
* the latest jQuery UJS adapter
* and Sam Ruby's assert_select_jquery function, which is automatically included for use in tests.
@@ -1,7 +1,7 @@
module Jquery
module Rails
VERSION = "1.0.18"
- JQUERY_VERSION = "1.7.0"
+ JQUERY_VERSION = "1.7.1"
JQUERY_UI_VERSION = "1.8.16"
JQUERY_UJS_VERSION = "82292010fb1743f038ab72b1f1e994e91be3eda3"
end
Oops, something went wrong.

0 comments on commit 8040662

Please sign in to comment.