Skip to content
Snippets Groups Projects
Commit f2576321 authored by Alissa Cheng's avatar Alissa Cheng
Browse files

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

# Conflicts:
#	atdb/taskdatabase/templates/taskdatabase/index.html
parents 1e6864d5 e17dad1f
No related branches found
No related tags found
1 merge request!337Upgrade to django 5
Pipeline #69266 failed
Stage: test
Stage: build
Stage: deploy_to_test
Stage: deploy_to_production
Hide whitespace changes
Inline Side-by-side
Showing
with 157 additions and 36 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