Commit 7bec9990 authored by Parcly Taxel's avatar Parcly Taxel

Merge branch 'master' into 'master'

New 3G collisions

See merge request !40
parents e4ee212f aa1aa5af
Pipeline #82276437 passed with stage
in 2 minutes and 54 seconds