Skip to content
Commit 305439e1 authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

Merge branch 'master' into develop 

# Conflicts:
#	LICENSE
parents e8b73957 94f1baa7
Hide whitespace changes
Inline Side-by-side
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