Commit 6a69f2fe authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

Merge branch 'dev' into 'newSeriesAggreg'

# Conflicts:
#   .regressionignore
#   DESCRIPTION
Showing with 488 additions and 363 deletions
+488 -363
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment