Merge branch 'master' into develop

This commit is contained in:
Georg Krause 2021-08-10 22:22:54 +02:00
commit ad597a93dd
No known key found for this signature in database
GPG Key ID: FD479B9A4D48E632
3 changed files with 8 additions and 3 deletions

View File

@ -10,7 +10,13 @@ This changelog is viewable on the web at https://docs.funkwhale.audio/changelog.
.. towncrier .. 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 Upgrade instructions are available at
https://docs.funkwhale.audio/admin/upgrading.html https://docs.funkwhale.audio/admin/upgrading.html

View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
__version__ = "1.1.3" __version__ = "1.1.4"
__version_info__ = tuple( __version_info__ = tuple(
[ [
int(num) if num.isdigit() else num int(num) if num.isdigit() else num

View File

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