Skip to content
Snippets Groups Projects
Commit 60f9ae1c authored by Sabine Schröder's avatar Sabine Schröder
Browse files

Merge branch 'dev' into 'swt-project-filtering'

# Conflicts:
#   toardb/timeseries/crud.py
parents 73cd3007 b3260147
Branches swt-project-filtering
No related tags found
2 merge requests!227merge dev into testing,!226enable aggregated filtering
Pipeline #256551 failed
Showing
with 3292 additions and 171 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment