Merge branch 'master' into develop

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)
 ----------------
 

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

changes/changelog.d/1226.enhancement

@@ -1 +0,0 @@
-Added controls to play volume of an album (#1226)

changes/changelog.d/1228.bugfix

@@ -1 +0,0 @@
-Fixed duplication of discs for multi-disc albums in album views (#1228)

changes/changelog.d/1246.enhancement

@@ -1 +0,0 @@
-Allow genre tags to be updated when rescanning files in-place (#1246)

changes/changelog.d/1250.bugfix

@@ -1 +0,0 @@
-Make the generated RSS feed more conformant with w3c specification (#1250)