Commit 0c42d998 authored by Thibaud Marie Eric Buffet's avatar Thibaud Marie Eric Buffet
Browse files

Merge branch 'master' into 'dev'

# Conflicts:
#   __init__.py
parents c2f7305f 96f12e76
Pipeline #2571017 failed with stage
in 5 seconds
Markdown is supported
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