Commit 44f19e70 authored by Michel Memeteau's avatar Michel Memeteau

Merge branch 'master' into '181-create-an-install-script'

# Conflicts:
#   install.linux.sh
parents 3ab76d17 5dd0762c
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