Merge branch 'dev' into dev-5.33.0-merged-dev

# Conflicts: # app/src/main/java/com/gh/gamecenter/forum/search/CommunitySearchEventListener.kt # app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt # app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt
2023-11-10 14:05:20 +08:00
parent 52980189ed 7189261c01
commit 3f60f85992
4 changed files with 9 additions and 23 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -149,7 +149,7 @@ oss-upload&send-email:
        ### 开启上传 ###
        - /usr/local/bin/python /upload.py
        ### 发送邮件
-        - /usr/local/bin/python /ci-android-mail.py
+        - /usr/local/bin/python /ci-android-mail-jira-comment.py
    only:
        - dev
        - dev-5.33.0