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

Merge branch 'master' into SDC-438-filters-on-dashboard

# Conflicts:
#	atdb/taskdatabase/templates/taskdatabase/index.html
parents 0da9c2ed 945d4d8a
No related branches found
No related tags found
2 merge requests!200apply filter to dashboard,!199apply filter to dashboard
Showing
with 551 additions and 65 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment