From f242767f12746f21cab56093bfa66f873d0ea725 Mon Sep 17 00:00:00 2001
From: Maicon Diniz Filippsen <filippsen@users.noreply.github.com>
Date: Wed, 5 Dec 2018 22:11:36 +0100
Subject: [PATCH] Bump version to 1.2.0 (#268)

---
 CHANGELOG           | 13 +++++++++++++
 src/manifest.json   |  2 +-
 src/reducers/app.js |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 1864278c..c60457dc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,18 @@
 # Superblocks Lab - Change log
 
+## [1.2.0]
+
++ Addition: Add a warning modal when trying to deploy to Mainnet #162
+* Improvement: Enable arrays as input when interacting with contract #186
+* Improvement: Allow for grouping code blocks in editor (folding) #230
+* Change: Update the list of upcoming features #254
+* Fix: Account injections not working in appview for test networks #256
+* Fix: Typos in Voting template #243
+* Fix: Uncaught error when trying to use inheritance without specifying base
+constructor arguments #101
+* Fix: Uncaught error when compiling code missing implementation #205
+
+
 ## [1.1.0]
 
 + Addition: Show the actual underlying filesystem in the left menu #166
diff --git a/src/manifest.json b/src/manifest.json
index f7a76853..b018df00 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -5,5 +5,5 @@
   "display": "standalone",
   "orientation": "portrait",
   "icons": [ ],
-  "version": "1.1.0"
+  "version": "1.2.0"
 }
diff --git a/src/reducers/app.js b/src/reducers/app.js
index a19d1bf6..15be484b 100644
--- a/src/reducers/app.js
+++ b/src/reducers/app.js
@@ -1,5 +1,5 @@
 export const initialState = {
-    version: '1.1.0',
+    version: '1.2.0',
 };
 
 export default function appReducer(state = initialState, action) {