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
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 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