Merge branch 'master' into dev_random_pk

# Conflicts: # live/src/main/res/values/strings.xml
2022-12-05 17:46:57 +08:00
parent ed6b531b8d 2a2672587c
commit 9ead9a6fb8
207 changed files with 7020 additions and 3152 deletions
--- a/config.gradle
+++ b/config.gradle
@@ -4,7 +4,7 @@ ext {
            buildToolsVersion: "28.0.3",
            minSdkVersion    : 21,
            targetSdkVersion : 31,
-            versionCode      : 307,
+            versionCode      : 310,
            versionName      : "6.4.5"
    ]
    manifestPlaceholders = [