From 51462200a2708e81af24613f18534a1afb65c3e2 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Mon, 1 Mar 2021 19:21:36 +0100
Subject: [PATCH] Version bump and changelog for 1.1-rc2
---
CHANGELOG | 14 ++++++++++++++
api/funkwhale_api/__init__.py | 2 +-
changes/changelog.d/1341.bugfix | 1 -
changes/changelog.d/1342.bugfix | 1 -
4 files changed, 15 insertions(+), 3 deletions(-)
delete mode 100644 changes/changelog.d/1341.bugfix
delete mode 100644 changes/changelog.d/1342.bugfix
diff --git a/CHANGELOG b/CHANGELOG
index 507e200b16..a4bd0232bc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,20 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
.. towncrier
+1.1-rc2 (2021-03-01)
+--------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+Bugfixes:
+
+- Fixed follows from Pleroma with custom Emoji as Tag by ignoring not supported tag types #1342
+- Update pleroma JSON-LD Schema (#1341)
+- Revert fork replacement of http-signature since official package breaks federation
+- Pin twisted version to 20.3.0
+
+
1.1-rc1 (2021-02-24)
--------------------
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 79e9a9faa8..7cf8ade2fc 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-__version__ = "1.1-rc1"
+__version__ = "1.1-rc2"
__version_info__ = tuple(
[
int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1341.bugfix b/changes/changelog.d/1341.bugfix
deleted file mode 100644
index 7a4d0e3c90..0000000000
--- a/changes/changelog.d/1341.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Update pleroma JSON-LD Schema (#1341)
diff --git a/changes/changelog.d/1342.bugfix b/changes/changelog.d/1342.bugfix
deleted file mode 100644
index 48adfbbf7e..0000000000
--- a/changes/changelog.d/1342.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed follows from Pleroma with custom Emoji as Tag by ignoring not supported tag types #1342
--
GitLab