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

Merge branch 'master' into 'SDC-934-discard-mechanism' 

# Conflicts:
#   atdb/logs/atdb.log
#   atdb/taskdatabase/templates/taskdatabase/index.html
parents c8f7dfab a35d392f
No related branches found
No related tags found
2 merge requests!295merge all the updates to master into this branch also,!294adding (initial) discard mechanism
Pipeline #49319 passed
Stage: build
Stage: deploy_to_test
Stage: deploy_to_production