pandorapan

Go to file

Martin 67b79cd306 Merge branch 'refs/heads/新潘多拉' into 新潘多拉_6.8.2

# Conflicts:
#	live/src/main/res/layout/dialog_live_data.xml
#	live/src/main/res/values-zh/strings.xml

2024-08-21 13:58:23 +08:00

app

Merge branch 'refs/heads/新潘多拉' into 新潘多拉_6.8.2

2024-08-21 13:58:23 +08:00

baidu

…

beauty

…

common

Merge branch 'refs/heads/新潘多拉' into 新潘多拉_6.8.2

2024-08-21 13:58:23 +08:00

FaceUnity

…

gradle/wrapper

…

IAP6Helper

…

lib_country_code

…

lib_faceunity

…

lib_google

…

lib_huawei

…

libs

…

live

Merge branch 'refs/heads/新潘多拉' into 新潘多拉_6.8.2

2024-08-21 13:58:23 +08:00

main

Merge branch 'refs/heads/新潘多拉' into 新潘多拉_6.8.2

2024-08-21 13:58:23 +08:00

pluginsForAnchor

…

SVGAlibrary

…

TabLayout

…

video

…

.gitignore

…

build.gradle

…

config.gradle

…

dependencies.gradle

…

gradle.properties

…

gradlew

…

gradlew.bat

…

hdl.jks

…

package_config.gradle

…

settings.gradle

…