Merge branch 'master' into dev

kylecrum · Nov 29, 2011 · e89018d · e89018d
2 parents ec29222 + 384bca3
commit e89018d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -1,6 +1,9 @@
 Twitter Bootstrap Form For Changes
 ==================================
 
+## 1.0.5 (2011-11-28) ##
+  - properly name inline input fields (re-closes [\#2])
+
 ## 1.0.4 (2011-11-20) ##
   - support for inline fields (closes [\#2])
 

diff --git a/lib/twitter_bootstrap_form_for/version.rb b/lib/twitter_bootstrap_form_for/version.rb
@@ -1,3 +1,3 @@
 module TwitterBootstrapFormFor
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end