Skip to content
Browse files

Sync with 1.0.1 release - Merge remote branch '1.0-stable' into rails3

Conflicts:
	CHANGELOG
	rails/init.rb
  • Loading branch information...
2 parents 42b4eb8 + b288b10 commit 2a9099e62724bb343c16d7bb87453e00fbe188eb @yabawock yabawock committed Aug 23, 2010
Showing with 7 additions and 3 deletions.
  1. +4 −0 CHANGELOG
  2. +1 −1 VERSION.yml
  3. +2 −2 formtastic.gemspec
View
4 CHANGELOG
@@ -10,6 +10,10 @@
* Added compatible install and form helpers (rails3)
* Added support for ActiveModel Validations, thanks to Guillaume Belleguic (rails3)
+1.0.1
+
+* fixed "already initialised constant" warnings on boot
+
1.0.0
* nothing changed from rc2
View
2 VERSION.yml
@@ -1,5 +1,5 @@
---
:major: 1
:minor: 0
-:patch: 0
:build:
+:patch: 1
View
4 formtastic.gemspec
@@ -5,11 +5,11 @@
Gem::Specification.new do |s|
s.name = %q{formtastic}
- s.version = "1.0.0"
+ s.version = "1.0.1"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Justin French"]
- s.date = %q{2010-08-12}
+ s.date = %q{2010-08-22}
s.description = %q{A Rails form builder plugin/gem with semantically rich and accessible markup}
s.email = %q{justin@indent.com.au}
s.extra_rdoc_files = [

0 comments on commit 2a9099e

Please sign in to comment.
Something went wrong with that request. Please try again.