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

…an-master
joliss · Nov 26, 2011 · 8040662 · 8040662
2 parents 859e374 + f4608e2
commit 8040662
Show file tree

Hide file tree

Showing 4 changed files with 295 additions and 329 deletions.
diff --git a/README.md b/README.md
@@ -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.

diff --git a/lib/jquery/rails/version.rb b/lib/jquery/rails/version.rb
@@ -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