0
Fork 0
mirror of https://github.com/Silent1566/webhtv.git synced 2026-11-15 19:30:54 +00:00
webhtv-mys/.github/workflows
Silent1566 86659a00e9 merge: 合并上游 fish2018/webhtv main 最新代码
# Conflicts:
#	.github/workflows/android-release.yml
#	app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingEnhanceActivity.java
#	app/src/main/java/com/fongmi/android/tv/player/PlayerManager.java
#	app/src/main/java/com/fongmi/android/tv/ui/activity/PlaybackActivity.java
#	app/src/main/java/com/fongmi/android/tv/utils/Github.java
#	app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingEnhanceFragment.java
#	app/src/mobile/res/values-zh-rCN/strings.xml
#	app/src/mobile/res/values-zh-rTW/strings.xml
#	app/src/mobile/res/values/strings.xml
History 2026-07-20 15:09:17 +08:00
..
android-release.yml merge: 合并上游 fish2018/webhtv main 最新代码 2026-07-20 15:09:17 +08:00
cnb-release-sync.yml ci: migrate optional CNB release mirror 2026-07-20 11:00:33 +08:00
delayed-dev-promotion.yml fix(ci): 直接延迟晋级 dev 到 main 2026-07-14 15:27:22 +08:00