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

Merge branch 'master' into SDC-957-automate-validation 

# Conflicts:
#	atdb/taskdatabase/models.py
parents fe132938 15897418
No related branches found
No related tags found
2 merge requests!304update branch with master,!302automatic quality validation
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.
Please register or to comment