Skip to content
Snippets Groups Projects
Commit c1f00d9c authored by Nico Vermaas's avatar Nico Vermaas
Browse files

Merge branch 'master' into upgrade-to-django-4 

# Conflicts:
#	atdb/taskdatabase/templates/taskdatabase/index.html
parents e41c6496 d8e0d82e
No related branches found
No related tags found
1 merge request!337Upgrade to django 5
Hide whitespace changes
Inline Side-by-side
Showing
with 289 additions and 29 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