Merge branch 'codex/disable-telemetry-default' into master
Resolved conflicts: - packages/client/ui-settings-general/README.md, README.zh.md: kept PR opt-in telemetry description (DSH_TELEMETRY_MODE) - scripts/snapshots/translation-prompt-v4: kept master's newer README structure snapshot - i18n.yaml pairing records: resolved per file state - pnpm-lock.yaml: regenerated - Modify/delete conflicts (scaffold/telemetry, sdk-follow-up-capabilities): kept master deletions
This commit is contained in:
commit
93b400a1de
2021 files changed
+43956
-23769
No files matched your search
+2
-2
@@ -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 README.md
|
||||
README.md: 71103650b07ec350188e5a2de07f41e6f048fcc7
|
||||
README.zh.md: 15a8e38693ad889470a6257796fa35e702facfb3
|
||||
README.md: c471b1a2470a5f2161a7950d757c5784a8e27aee
|
||||
README.zh.md: 16c4d4adae2c3b4e0ecb48380a05a4f9643f9d45
|
||||
Reference in new issue
Block a user