Skip to content

chore: sync main from pingdotgg/t3code - #96

Merged
D3SOX merged 8 commits into
mainfrom
upstream-sync
Nov 20, 2026
Merged

D3SOX merged 8 commits into
mainfrom
upstream-sync

Conversation

@D3SOX

@D3SOX D3SOX commented Nov 20, 2026

Copy link
Copy Markdown
Owner

Sync pingdotgg/t3code:main into main.

Merge with a merge commit to preserve fork changes and shared upstream history.

juliusmarminge and others added 8 commits November 20, 2026 12:06
…ls (pingdotgg#39837)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…39406)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…dotgg#39439)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…gdotgg#39515)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…ack offers nothing (pingdotgg#38506)

Co-authored-by: Claude Haiku 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…indows is locked (pingdotgg#39198)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	apps/web/src/i18n/translations/de.json
#	apps/web/src/i18n/translations/en.json
#	apps/web/src/i18n/translations/es.json
#	apps/web/src/i18n/translations/fr.json
#	apps/web/src/i18n/translations/ja.json
#	apps/web/src/i18n/translations/ko.json
#	apps/web/src/i18n/translations/pt-BR.json
#	apps/web/src/i18n/translations/ru.json
#	apps/web/src/i18n/translations/sv.json
#	apps/web/src/i18n/translations/zh.json
#	packages/contracts/src/settings.ts
@github-actions github-actions Bot added the vouch:trusted Author is trusted by repo permissions or the VOUCHED list. label Nov 20, 2026
@D3SOX
D3SOX merged commit 3b6b24f into main Nov 20, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

vouch:trusted Author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants