Commit 1ab86ff5 authored by nanahira's avatar nanahira

Merge branch 'patch-ccg' into server_mc

parents f2437594 db332d1b
Pipeline #4250 passed with stages
in 3 minutes and 30 seconds