Commit 19c16c27 authored by wind2009's avatar wind2009

Merge remote-tracking branch '233/patch-tag-surrender' into server-develop

parents 79f36bf4 df19eabe
Pipeline #27223 passed with stages
in 2 minutes and 23 seconds