Files
pftom 821eeaf228 Merge branch 'main' into incredible-vessel
Resolve conflicts where main added the 'nanobanana' image provider
alongside this branch's 'remotion' video provider:

- apps/daemon/src/media-models.ts: keep both new providers
- apps/web/src/media/models.ts: keep both ids in MediaProviderId union
  and both entries in MEDIA_PROVIDERS
- apps/web/src/components/NewProjectPanel.tsx: extend the surface
  whitelist with both — image gets 'nanobanana', video keeps 'remotion'
2026-05-06 21:12:34 +08:00
..