Merge branch 'develop' of https://dev.funkwhale.audio/funkwhale/funkwhale

.gitlab-ci.yml

CHANGELOG

CONTRIBUTING.rst

api/Dockerfile

api/config/settings/common.py

api/config/settings/local.py

api/config/settings/production.py

api/funkwhale_api/cli/users.py

api/funkwhale_api/contrib/scrobbler/scrobbler.py

...e_api/contrib/sites/migrations/0004_alter_site_options.py

api/funkwhale_api/federation/factories.py

api/funkwhale_api/federation/jsonld.py

api/funkwhale_api/instance/dynamic_preferences_registry.py

api/funkwhale_api/moderation/factories.py

api/funkwhale_api/moderation/serializers.py

api/funkwhale_api/moderation/tasks.py

...api/music/migrations/0054_alter_uploadversion_mimetype.py

api/funkwhale_api/radios/radios.py

api/funkwhale_api/subsonic/authentication.py

...hale_api/templates/registration/password_reset_email.html