Merge branch '538-form-and-model-extensions-imported-in-wrong-order' into...

Merge branch '538-form-and-model-extensions-imported-in-wrong-order' into 537-oauth-endpoint-urls-broken-in-recent-refactoring

CHANGELOG.rst

@@ -13,6 +13,7 @@ Fixed
 ~~~~~
 
 * Make style.css and favicons cachable.
+* Import model extensions from other apps before form extensions.
 * Recreate backwards compatiblity for OAuth URLs by using ``oauth/`` again.
 
 Removed

aleksis/core/apps.py

@@ -47,7 +47,7 @@ class CoreConfig(AppConfig):
         from django.conf import settings  # noqa
 
         # Autodiscover various modules defined by AlekSIS
-        autodiscover_modules("form_extensions", "model_extensions", "checks")
+        autodiscover_modules("model_extensions", "form_extensions", "checks")
 
         sitepreferencemodel = self.get_model("SitePreferenceModel")
         personpreferencemodel = self.get_model("PersonPreferenceModel")