Commit a983a0c4 authored by wind2009's avatar wind2009

Merge branch 'patch-1' into 'master'

fix--Mimighoul Charm

See merge request !102
parents c317a341 d5ae85f1
Pipeline #29404 passed with stages
in 1 minute and 27 seconds