Browse files

Merge branch 'master' into dev

  • Loading branch information...
2 parents ec29222 + 384bca3 commit e89018d03d67387b586262d7ee0316030b1c9ab4 Kyle committed Nov 29, 2011
Showing with 4 additions and 1 deletion.
  1. +3 −0 CHANGELOG.markdown
  2. +1 −1 lib/twitter_bootstrap_form_for/version.rb
View
3 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])
View
2 lib/twitter_bootstrap_form_for/version.rb
@@ -1,3 +1,3 @@
module TwitterBootstrapFormFor
- VERSION = '1.0.4'
+ VERSION = '1.0.5'
end

0 comments on commit e89018d

Please sign in to comment.