Skip to content
Snippets Groups Projects
Commit d68fe2a6 authored by Laurent Mercadier's avatar Laurent Mercadier
Browse files

Merge branch 'master' into 'bunch_pattern'

# Conflicts:
#   __init__.py
parents cbff6058 e6135f5f
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment