Commit fe5ab42e authored by wind2009's avatar wind2009

Merge remote-tracking branch '233/patch-side-chat' into develop

parents 7c3757a2 39bbff56
Pipeline #26964 passed with stages
in 5 minutes and 12 seconds