Merge branch '783-migration-error' into 'develop'

Fix #783: migration issue on develop

Closes #783

See merge request funkwhale/funkwhale!704

api/config/settings/common.py

@@ -185,10 +185,6 @@ MIDDLEWARE = (
     "funkwhale_api.users.middleware.RecordActivityMiddleware",
 )
 
-# MIGRATIONS CONFIGURATION
-# ------------------------------------------------------------------------------
-MIGRATION_MODULES = {"sites": "funkwhale_api.contrib.sites.migrations"}
-
 # DEBUG
 # ------------------------------------------------------------------------------
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#debug
@@ -229,7 +225,8 @@ MIGRATION_MODULES = {
     # see https://github.com/jazzband/django-oauth-toolkit/issues/634
     # swappable models are badly designed in oauth2_provider
     # ignore migrations and provide our own models.
-    "oauth2_provider": None
+    "oauth2_provider": None,
+    "sites": "funkwhale_api.contrib.sites.migrations",
 }
 
 #