From f45d8e5fb422acd1eeb6371d615312d0cad0a938 Mon Sep 17 00:00:00 2001
From: Stephen Potenza <potenza@gmail.com>
Date: Tue, 17 Feb 2015 16:56:44 -0800
Subject: [PATCH] new release: v2.3.0

---
 CHANGELOG.md                  | 7 +++++--
 Gemfile.lock                  | 2 +-
 README.md                     | 4 ++--
 lib/bootstrap_form/version.rb | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ad2c2ccc..333fc90ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,13 @@
-## Pending Release (master-branch only)
+## 2.3.0 (2015-02-17)
 
 Bugfixes:
 
   - Use #underscore, not #downcase for help text scope (#140, @atipugin)
   - Radio button and checkbox labels will now include the disabled class as needed. (#156, @ScottSwezey)
-  - Fixed issue with setting offset in form_group without label in horizontal layout  
+  - Fixed issue with setting offset in form_group without label in horizontal layout
     when form uses non-default label_col
+  - Fixed wrapper options (#153, @veilleperso)
+  - Fix errors on non-ActiveRecord setups (#200, @sgnn7)
 
 Features:
 
@@ -14,6 +16,7 @@ Features:
   - Allow to skip label rendering (#145, @atipugin)
   - Added a `required` CSS class for labels with required attributes (#150, @krsyoung)
   - Added option to customize labels' class.
+  - Allow callable value_method and text_method for collection_check_boxes and collection_radio_buttons (#199, @shadwell)
 
 ## 2.2.0 (2014-09-16)
 
diff --git a/Gemfile.lock b/Gemfile.lock
index cc453e9ca..d7385044f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bootstrap_form (2.2.0)
+    bootstrap_form (2.3.0)
 
 GEM
   remote: http://rubygems.org/
diff --git a/README.md b/README.md
index 7aeb16ff3..dabab1aa9 100644
--- a/README.md
+++ b/README.md
@@ -343,7 +343,7 @@ buttons.
 ```
 
 You can also use the `primary` helper, which adds `btn btn-primary` to your
-submit button **(master branch only)**:
+submit button:
 
 ```erb
 <%= f.primary "Optional Label" %>
@@ -463,7 +463,7 @@ You can turn off inline errors for the entire form like this:
 <% end %>
 ```
 
-### Label Errors (Master-branch only)
+### Label Errors
 
 You can also display validation errors in the field's label; just turn
 on the `:label_errors` option. Here's an example:
diff --git a/lib/bootstrap_form/version.rb b/lib/bootstrap_form/version.rb
index 6fd23a4f4..1dc6c88ae 100644
--- a/lib/bootstrap_form/version.rb
+++ b/lib/bootstrap_form/version.rb
@@ -1,3 +1,3 @@
 module BootstrapForm
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end