From ffe306ed5c1e269e211410248af3d77b6c7af627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Pe=C3=B1a?= <devilcius@gmail.com>
Date: Thu, 14 Jul 2022 12:53:53 +0200
Subject: [PATCH] Version bump and changelog for 1.2.7

---
 CHANGELOG                       | 25 +++++++++++++++++++++++++
 api/funkwhale_api/__init__.py   |  2 +-
 changes/changelog.d/1817.bugfix |  1 -
 3 files changed, 26 insertions(+), 2 deletions(-)
 delete mode 100644 changes/changelog.d/1817.bugfix

diff --git a/CHANGELOG b/CHANGELOG
index ede525489..84e79089c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,31 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+1.2.7 (2022-07-14)
+------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+Bugfixes:
+
+- Fixed libre.fm plugin not submitting scrobbles (#1817)
+
+Committers:
+
+- Georg Krause
+- Marcos Peña
+
+Contributors to our Issues:
+
+- Ciarán Ainsworth
+- Marcos Peña
+
+Contributors to our Merge Requests:
+
+- Georg Krause
+- Marcos Peña
+
 1.2.6 (2022-07-04)
 ------------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index ca39fe0ce..10d6f210f 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.2.6"
+__version__ = "1.2.7"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1817.bugfix b/changes/changelog.d/1817.bugfix
deleted file mode 100644
index b1d627713..000000000
--- a/changes/changelog.d/1817.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed libre.fm plugin not submitting scrobbles (#1817)