From c82f64cc7d950df39eafd9164593f12aa1bbde02 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Thu, 6 Jan 2022 17:35:53 +0100
Subject: [PATCH] Version bump and changelog for 1.2.1
---
CHANGELOG | 31 +++++++++++++++++++++++++++++++
api/funkwhale_api/__init__.py | 2 +-
changes/changelog.d/1652.bugfix | 1 -
changes/changelog.d/1655.bugfix | 1 -
4 files changed, 32 insertions(+), 3 deletions(-)
delete mode 100644 changes/changelog.d/1652.bugfix
delete mode 100644 changes/changelog.d/1655.bugfix
diff --git a/CHANGELOG b/CHANGELOG
index 98a0d1b7ce..cd051c6a9d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,37 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
.. towncrier
+1.2.1 (2022-01-06)
+------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+Bugfixes:
+
+- Fix Pipeline for stable release builds (#1652)
+- Fix remote content page (#1655)
+
+Contributors to our Issues:
+
+Ciarán Ainsworth
+Georg Krause
+Jakob Schürz
+Mathieu Jourdan
+Micha Gläß-Stöcker
+petitminion
+
+Contributors to our Merge Requests:
+
+Georg Krause
+
+Committers:
+Dignified Silence
+Georg Krause
+JuniorJPDJ
+nztvar
+
+
1.2.0 (2021-12-27)
------------------
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index a10021022c..42addee501 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-__version__ = "1.2.0"
+__version__ = "1.2.1"
__version_info__ = tuple(
[
int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1652.bugfix b/changes/changelog.d/1652.bugfix
deleted file mode 100644
index fa194ce38a..0000000000
--- a/changes/changelog.d/1652.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix Pipeline for stable release builds (#1652)
diff --git a/changes/changelog.d/1655.bugfix b/changes/changelog.d/1655.bugfix
deleted file mode 100644
index f5607d3c54..0000000000
--- a/changes/changelog.d/1655.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix remote content page (#1655)
--
GitLab