Merge branch 'master' into dev_blind_box

# Conflicts: # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml
2023-05-27 18:25:14 +08:00
parent c28a91b128 9526a14ca2
commit c3b5f17f44
17 changed files with 115 additions and 13 deletions
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -1192,4 +1192,5 @@ Limited ride And limited avatar frame</string>
    <string name="participate_in">參與</string>
    <string name="extract_to">%s在%s中抽取到了</string>
    <string name="extract_to2">%S送给了%s</string>
+    <string name="live_vote_create_error">Create Vote Error</string>
 </resources>