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

Merge branch 'master' into develop 

# Conflicts:
#	LICENSE
parents e8b73957 94f1baa7

LICENSE

+14 −14

File changed.

Contains only whitespace changes.