From 68bc76bc9e4f15f65e7a565cb60d6610aac255e9 Mon Sep 17 00:00:00 2001
From: Agate <me@agate.blue>
Date: Sat, 31 Oct 2020 12:43:37 +0100
Subject: [PATCH] Version bump and changelog for 1.0.1

---
 CHANGELOG                            | 18 ++++++++++++++++++
 api/funkwhale_api/__init__.py        |  2 +-
 changes/changelog.d/1226.enhancement |  1 -
 changes/changelog.d/1228.bugfix      |  1 -
 changes/changelog.d/1246.enhancement |  1 -
 changes/changelog.d/1250.bugfix      |  1 -
 6 files changed, 19 insertions(+), 5 deletions(-)
 delete mode 100644 changes/changelog.d/1226.enhancement
 delete mode 100644 changes/changelog.d/1228.bugfix
 delete mode 100644 changes/changelog.d/1246.enhancement
 delete mode 100644 changes/changelog.d/1250.bugfix

diff --git a/CHANGELOG b/CHANGELOG
index 06b146d8c..23ff2a769 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,24 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
 
 .. towncrier
 
+1.0.1 (2020-10-31)
+------------------
+
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+Enhancements:
+
+- Added controls to play volume of an album (#1226)
+- Allow genre tags to be updated when rescanning files in-place (#1246)
+
+
+Bugfixes:
+
+- Fixed broken install because of upgraded dependencies
+- Fixed duplication of discs for multi-disc albums in album views (#1228)
+- Make the generated RSS feed more conformant with w3c specification (#1250)
+
 1.0 (2020-09-09)
 ----------------
 
diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py
index 765773ceb..b478701c0 100644
--- a/api/funkwhale_api/__init__.py
+++ b/api/funkwhale_api/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.0"
+__version__ = "1.0.1"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num
diff --git a/changes/changelog.d/1226.enhancement b/changes/changelog.d/1226.enhancement
deleted file mode 100644
index 2f3bace25..000000000
--- a/changes/changelog.d/1226.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Added controls to play volume of an album (#1226)
\ No newline at end of file
diff --git a/changes/changelog.d/1228.bugfix b/changes/changelog.d/1228.bugfix
deleted file mode 100644
index 226c85057..000000000
--- a/changes/changelog.d/1228.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed duplication of discs for multi-disc albums in album views (#1228)
\ No newline at end of file
diff --git a/changes/changelog.d/1246.enhancement b/changes/changelog.d/1246.enhancement
deleted file mode 100644
index 10edbfb23..000000000
--- a/changes/changelog.d/1246.enhancement
+++ /dev/null
@@ -1 +0,0 @@
-Allow genre tags to be updated when rescanning files in-place (#1246)
diff --git a/changes/changelog.d/1250.bugfix b/changes/changelog.d/1250.bugfix
deleted file mode 100644
index 4d4cbddf2..000000000
--- a/changes/changelog.d/1250.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Make the generated RSS feed more conformant with w3c specification (#1250)