From 3c8c15246010cfe77707b80e4519bbaa83a7fd7f Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Mon, 2 Aug 2021 20:47:50 +0200
Subject: [PATCH] Version bump and changelog for 1.1.4

---
 CHANGELOG                     | 6 ++++++
 api/funkwhale_api/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 12f78c2c85..261116f791 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,12 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+1.1.4 (2021-08-02)
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+- Pinned version of asgiref to avoid trouble with latest release. For further information, see #1516
+
 1.1.3 (2021-08-02)
 Upgrade instructions are available at
 https://docs.funkwhale.audio/admin/upgrading.html
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 2f679f824f..43540af4c5 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.1.3"
+__version__ = "1.1.4"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
-- 
GitLab