Merge branch 'refs/heads/master' into netgis_map_client_update

# Conflicts: # templates/map/client/config.json
2025-05-09 16:03:35 +02:00
parent bc9cc09372 6fe67a8fbf
commit c2b12649b0
28 changed files with 336 additions and 578 deletions
@@ -66,7 +66,6 @@ INSTALLED_APPS = [
    'django.contrib.staticfiles',
    'django.contrib.gis',
    'django.contrib.humanize',
-    'simple_sso.sso_server',
    'django_tables2',
    'bootstrap_modal_forms',
    'fontawesome_5',