Skip to content
Snippets Groups Projects
Commit 06e12e6d authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'master' into '563-prepare-for-django-4-0' 

# Conflicts:
#   CHANGELOG.rst
parents b03f6758 2c668398
No related branches found
No related tags found
1 merge request!808Resolve "Prepare for Django 4.0"
Pipeline #103043 failed
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 802 additions and 183 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment