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

Merge remote-tracking branch 'origin/master'

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