Merge branch 'master' into develop

2021-08-10 22:22:54 +02:00 · 2021-08-10 22:22:54 +02:00 · ad597a93dd
parent 95cbf16c75 3c8c152460
commit ad597a93dd
3 changed files with 8 additions and 3 deletions
--- a/8
+++ b/8
@ -10,7 +10,13 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.

 .. towncrier

-1.1.3 (unreleased)
+1.1.4 (2021-08-02)
+Upgrade instructions are available at
+https://docs.funkwhale.audio/admin/upgrading.html
+
+- Pinned version of asgiref to avoid trouble with latest release. For further information, see #1516
+
+1.1.3 (2021-08-02)
 Upgrade instructions are available at
 https://docs.funkwhale.audio/admin/upgrading.html

--- a/api/funkwhale_api/init.py
+++ b/api/funkwhale_api/init.py
@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-__version__ = "1.1.3"
+__version__ = "1.1.4"
 __version_info__ = tuple(
    [
        int(num) if num.isdigit() else num
--- a/changes/changelog.d/1498.bug
+++ b/changes/changelog.d/1498.bug
@ -1 +0,0 @@
-Fix the scrobbler plugin submitting literal "None" as MusicBrainz ID (#1498)
				`@ -1 +0,0 @@`
				`Fix the scrobbler plugin submitting literal "None" as MusicBrainz ID (#1498)`