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

Merge branch 'master' into 'SDC-933-QA-Process'

# Conflicts:
#   atdb/taskdatabase/templates/taskdatabase/index.html
parents 050b0766 1a242fd6
No related branches found
No related tags found
2 merge requests!290pull in the newest changes in master,!289"suspended" and "discarded" tasks
Pipeline #47217 passed