From 619bd735a694beecf4903cc29107b29e0629bb14 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Fri, 27 Oct 2017 12:07:29 -0700
Subject: [PATCH] Version 1.1.2

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

diff --git a/CHANGELOG b/CHANGELOG
index 8cf2a9c..b74544d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,3 +40,11 @@
 * Fix .netrc authentication (#2700) (#2708)
 * Fix slice out of bounds error in mailer (#2479) (#2696)
 
+[1.1.2]
+* Update to version 1.2.2
+* Add checks for commits with missing author and time (#2771) (#2785)
+* Fix sending mail with a non-latin display name (#2559) (#2783)
+* Sync MaxGitDiffLineCharacters with conf/app.ini (#2779) (#2780)
+* Update vendor git (#2765) (#2772)
+* Fix emojify image URL (#2769) (#2773)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index ec7d9d6..ff0b652 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -4,7 +4,7 @@
   "author": "Gitea developers",
   "description": "file://DESCRIPTION.md",
   "tagline": "A painless self-hosted Git Service",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "healthCheckPath": "/healthcheck",
   "httpPort": 3000,
   "addons": {
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
index 790f32d..12c1240 100644
--- a/DESCRIPTION.md
+++ b/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.2.1</upstream>
+This app packages Gitea <upstream>1.2.2</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.