Skip to content
Snippets Groups Projects
Commit 759e54eb authored by Matthieu Fesselier's avatar Matthieu Fesselier
Browse files

Merge branch 'master' into 'nextmixin-add'

# Conflicts:
#   source/index.rst
parents 7f40af8c f3d04336
No related branches found
No related tags found
Loading
Showing
with 213 additions and 167 deletions
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