From 82e0252c37acd87d24086e0634db556e1884ad9f Mon Sep 17 00:00:00 2001
From: "Rui Zhao (renyuneyun)" <renyuneyun@gmail.com>
Date: Sun, 20 May 2018 22:08:02 +0100
Subject: [PATCH] Move to v0.6.1

---
 CHANGELOG.md     | 6 ++++++
 app/build.gradle | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4926e33..b850be49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 ======
 
+* v0.6.1: Bug fixes && prompt improvement
+	* Fix crash when renaming Condition
+	* Fix crash when deleting Condition in use
+	* Disallow adding new Condition / Scenario / Profile when no relevant plugin is enabled
+	* Prompt for failure to delete
+
 * v0.6: Add ConditionEvent (enter/leave) && Go back when pressing "back" && Do not clear log when reloading service && Various fixes && Dev changes
 	* Add ConditionEvent - Events for Condition state
 		* Enter Condition and Leave condition
diff --git a/app/build.gradle b/app/build.gradle
index 513f815e..e1c56d46 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId 'ryey.easer'
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 69
-        versionName "0.6"
+        versionCode 70
+        versionName "0.6.1"
 
         vectorDrawables.useSupportLibrary = true