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
3 merge requests!39Dev nico,!17pre-deploy to acceptance,!13CI/CD pipeline for production (sdc.astron.nl)
Pipeline #9356 passed
Stage: build