Merge remote-tracking branch 'origin/master'

# Conflicts:
#	common/src/main/res/values/strings.xml
This commit is contained in:
2022-10-08 11:10:12 +08:00
25 changed files with 852 additions and 100 deletions

View File

@@ -859,7 +859,7 @@ Limited ride And limited avatar frame</string>
<string name="you_may_also_like">you may also like</string>
<string name="anchor">anchor</string>
<string name="anchor_more">More</string>
<string name="wonderful_live">Wonderful live</string>
<string name="wonderful_live">Live</string>
<string name="recommended_for_you">More</string>
<string name="fun_games">Fun Games</string>
<string name="value_added_benefits">Value-added benefits</string>