From e4cf94606c45261675181336fc14b62b29f74bb7 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Mon, 17 Sep 2018 19:05:15 +0300
Subject: [PATCH] v1.49-edge-1

---
 CHANGELOG.md           | 25 +++++++++++++++++++++++++
 package.json           |  2 +-
 sandstorm-pkgdef.capnp |  4 ++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbcfc6f0b..18d1cd6fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,28 @@
+# v1.49-edge-1 2018-09-17 Wekan release
+
+This release adds the following new features:
+
+- Change from Node v8.12.0 prerelease to use official Node v8.12.0.
+    
+Thanks to GitHub user xet7 for contributions.
+
+# v1.49 2018-09-17 Wekan release
+
+This release fixes the following bugs:
+
+- Fix lint errors.
+
+Thanks to GitHub user xet7 for contributions.
+
+# v1.48 2018-09-17 Wekan release
+
+This release removes the following new features:
+
+- Remove IFTTT rules, until they are fixed.
+- Remove OAuth2, until it is fixed.
+
+Thanks to GitHub user xet7 for contributions.
+
 # v1.47 2018-09-16 Wekan release
 
 This release adds the following new features:
diff --git a/package.json b/package.json
index 9f5cfdb33..1e0f6a12a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "1.47.0",
+  "version": "v1.49-edge-1",
   "description": "The open-source kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 80c9add2c..e066c6d6d 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 132,
+    appVersion = 135,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "1.47.0~2018-09-16"),
+    appMarketingVersion = (defaultText = "1.49.0~2018-09-17-edge-1"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,