Merge branch 'bump-to-1-2'

nullscreen · Nov 13, 2014 · 372ae13 · 372ae13
2 parents 181c53d + 0fafb13
commit 372ae13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ For more information about changelogs, check
 [Keep a Changelog](http://keepachangelog.com) and
 [Vandamme](http://tech-angels.github.io/vandamme).
 
-## 1.2.0 - unreleased
+## 1.2.0 - 2014-11-13
 
 * [FEATURE] Add support for Middleman and Padrino for all helpers except `form_for`
 * [FEATURE] Extend `button_to` to accept the same :content, :size and :layout options as `button`

diff --git a/lib/bh/version.rb b/lib/bh/version.rb
@@ -1,3 +1,3 @@
 module Bh
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end