Merge branch 'master' into develop

CHANGELOG

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

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

changes/changelog.d/1498.bug

@@ -1 +0,0 @@
-Fix the scrobbler plugin submitting literal "None" as MusicBrainz ID (#1498)