Merge branch 'dev_6.5.5'

# Conflicts: # common/src/main/res/values-en-rUS/string.xml # common/src/main/res/values-zh-rHK/strings.xml # common/src/main/res/values-zh-rTW/strings.xml # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml # live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
2023-09-06 10:42:05 +08:00
parent 0c5ef0befe fa8d8a7421
commit b7ba717cb9
21 changed files with 120 additions and 39 deletions
--- a/common/src/main/res/values-zh/strings.xml
+++ b/common/src/main/res/values-zh/strings.xml
@@ -1313,5 +1313,6 @@
    <string name="user_apply_for_lianmai">連麥申請</string>
    <string name="live_mic_anchor_to_user_dialog">主播：</string>

+    <string name="live_send_red_packge_fans_group">加入粉絲團</string>

 </resources>