Commit 42bf5ee6 authored by nanahira's avatar nanahira

Merge branch 'patch-ccg' into server_mc

parents 730c84b1 c2c9379d
Pipeline #4971 passed with stages
in 2 minutes and 5 seconds