Merge remote-tracking branch 'origin/main' into SaaS-update

Browse Source

# Conflicts:
#	frontend/editor/src/proprietary/components/chat/ChatContext.tsx
#	frontend/editor/src/saas/components/shared/TrialStatusBanner.tsx

...

This commit is contained in:

James Brunton

2026-06-12 09:58:40 +01:00

parent e3e49c07ae 946c032fb5

commit d995471a55

59 changed files with 10405 additions and 227 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

frontend/editor/public/locales/en-US/translation.toml

+8380

File diff suppressed because it is too large Load Diff