mplorentz 147cea3768 Merge branch 'dev' into feature/134-video-in-calls ...

Resolve conflicts in app.css (keep voice layout classes + .left-content),
PageContent (split frame + fixed scroll chrome), and room page (video UI,
compose zone + chat__compose, ResizeObserver padding, dev h-screen tail).

Made-with: Cursor

2026-04-06 11:16:48 -04:00

..

app

Merge branch 'dev' into feature/134-video-in-calls

2026-04-06 11:16:48 -04:00

assets/icons

feature/23-voice-room/poc (#93)

2026-03-16 20:38:05 +00:00

lib

Merge branch 'dev' into feature/134-video-in-calls

2026-04-06 11:16:48 -04:00

routes

Merge branch 'dev' into feature/134-video-in-calls

2026-04-06 11:16:48 -04:00

app.css

Merge branch 'dev' into feature/134-video-in-calls

2026-04-06 11:16:48 -04:00

app.d.ts

Tweaks to navigation

2024-10-23 09:45:06 -07:00

app.html

Fixing bugs with push notifications

2026-01-28 13:36:19 -08:00

service-worker.js

Bring back service worker

2026-02-02 10:35:05 -08:00

types.d.ts

Add types file

2024-11-13 10:32:47 -08:00