Commit f16a5a68 authored by nanahira's avatar nanahira

Merge branch 'patch-ccg' into server_mc

parents 42bf5ee6 a94f9b84
Pipeline #5057 passed with stages
in 3 minutes and 28 seconds