From 6dd38a48b2f54da6480ebabaaed78e4398efedfe Mon Sep 17 00:00:00 2001
From: Jens Ljungblad <jens.ljungblad@gmail.com>
Date: Tue, 2 Feb 2016 14:17:56 +0100
Subject: [PATCH] Prepares release

---
 CHANGELOG.md          | 2 +-
 lib/godmin/version.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0272b3fa..a54d65db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-### Unreleased
+### 1.2.0 - 2016-02-02
 Features
 - Adds support for custom ordering of columns (https://github.com/varvet/godmin/pull/168)
 - Adds passing of html options to association helper (https://github.com/varvet/godmin/pull/176)
diff --git a/lib/godmin/version.rb b/lib/godmin/version.rb
index f5bdbe7c..6d9a5d3d 100644
--- a/lib/godmin/version.rb
+++ b/lib/godmin/version.rb
@@ -1,3 +1,3 @@
 module Godmin
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end