Merge remote-tracking branch 'origin/master' into worktree/windows-acl-hardening-followup
# Conflicts: # docs/config-catalog.i18n.yaml # packages/sandbox/sandbox-local/README.i18n.yaml
This commit is contained in:
@@ -2,5 +2,5 @@
|
||||
# side as of the last confirmed-consistent state. Both languages carry equal authority;
|
||||
# after editing either side, bring the other along and re-record with:
|
||||
# pnpm run verify-translation-pairing --write docs/config-catalog.md
|
||||
config-catalog.md: 92e61423568d9e80b940359914a3d76bdd4e3030
|
||||
config-catalog.zh.md: aa0b1ccf11424773bd1aa62001b250ed030ca838
|
||||
config-catalog.md: 059f763bf7375af2618b4080e44121a35d84006f
|
||||
config-catalog.zh.md: c1114b140162610636b07ace535dc89c1a53c77b
|
||||
|
||||
Reference in New Issue
Block a user