Merge branch 'master' into rails4

altran-nl · Aug 9, 2013 · 6b8d3ee · 6b8d3ee
2 parents 2e400a4 + 92e01ff
commit 6b8d3ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,4 @@
-= 3.3.3 (not released)
+= 3.3.3
 - Allow to override select options in active_scaffold_search_select
 - Load effects from jQuery UI when using jquery-rails 3 gem
 - Fix searching on nested scaffolds (broken on 3.3.2)

diff --git a/lib/active_scaffold/version.rb b/lib/active_scaffold/version.rb
@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 3
-    PATCH = 2
+    PATCH = 3
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end