From d6502a43cb1df91396b5e109cddc0d9743528ee8 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Fri, 28 Feb 2020 11:34:33 -0800
Subject: [PATCH] Version 1.1.0

---
 CHANGELOG             | 3 +++
 CloudronManifest.json | 2 +-
 DESCRIPTION.md        | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 2725874..ae1a965 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,3 +4,6 @@
 [1.0.0]
 * Initial stable version
 
+[1.1.0]
+* Update Mastodon to 3.1.2
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index c49551b..5074ec6 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -5,7 +5,7 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Federated social network",
-  "version": "1.0.0-2",
+  "version": "1.1.0",
   "healthCheckPath": "/about",
   "httpPort": 8000,
   "memoryLimit": 1073741824,
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index df73500..c1db9a5 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Mastodon <upstream>3.0.1</upstream>.
+This app packages Mastodon <upstream>3.1.2</upstream>.
 
 Your self-hosted, globally interconnected microblogging community.