Commit 5dd82632 authored by Maxime Berger's avatar Maxime Berger
Browse files

Merge branch 'master' into 'correctionAlArrache'

# Conflicts:
#   js/piece.js
#   js/scene.js
parents 933bb45d 54a78f2d
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