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

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	atdb/taskdatabase/templates/taskdatabase/index.html
parents 56903475 179c874f
No related branches found
No related tags found
No related merge requests found
Pipeline #74175 passed
Showing
with 47 additions and 22 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment