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

Merge branch 'master' into 'dev-nico'

# Conflicts:
#   atdb/taskdatabase/templates/taskdatabase/index.html
parents e03ab8a0 9d762d56
No related branches found
No related tags found
Loading
Checking pipeline status
Showing
No files found.
with 0 additions and 0 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment