Commit 6ab72bc4 authored by aleajactaest's avatar aleajactaest

Merge branch 'ryzomcore' into 'develop'

Ryzomcore merge upstream

See merge request !42
parents edb19ee4 520b8d1b
Pipeline #709 failed with stages
in 240 minutes and 4 seconds