0
Fork 0
mirror of https://github.com/Silent1566/webhtv.git synced 2026-10-25 10:16:33 +00:00

merge: 合并 origin/beta ee8b058a97(PR #463-#464)并复评 dev2 未推送的 2 个首页导航提交

Verification: 0 冲突(Automatic merge went well);合并索引树 a46ca5c178 与 git merge-tree --write-tree 预测逐字节相同(MERGE-RESULT-EXACT);L1 beta 5163 / index 5164 / missing 0;L2 A(5)=diff --cached vs origin/beta SETS-IDENTICAL、D(13)=diff --cached vs HEAD SETS-IDENTICAL、两侧路径交集 0;合并窗口 revert 主题提交为空,历史 revert 提交 a5aeb3de47 已是 dev2 与 beta 共同祖先

Task-Guard: C87-beta-merge-review-dev2-20261020
This commit is contained in:
Silent1566 2026-10-20 19:20:14 +08:00
commit 2b098a691b
13 changed files with 773 additions and 78 deletions