From dbc9350cf1bf363eddc141542ec6bc8b7e8b193d Mon Sep 17 00:00:00 2001
From: bakape <scorpid33@gmail.com>
Date: Wed, 30 Sep 2015 00:47:50 +0300
Subject: [PATCH] v1.2.0

---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22a05315b..3e04059fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 Project uses [Semantic Versioning](http://semver.org/)
 
+##1.2.0 - 2015-09-30
+###Added
+- Ability to select redis database to use
+- Automatic setup script for Ubuntu Trusty
+
+###Removed
+- HTML caching
+
 ##1.1.1 - 2015-09-23
 ###Fixed
 - Post menu background artefact
diff --git a/package.json b/package.json
index 3b18ec4a2..117baa141 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meguca",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Real-time imageboard",
   "keywords": [
     "realtime",