Johnny Amancio 32e244bb05 resolve merge conflicts

2026-04-13 11:46:32 +02:00

..

addons

feat: merge opencode v1.1.54

2026-02-10 22:10:03 -03:00

components

refactor: kilo compat for v1.3.10

2026-04-12 21:09:24 +02:00

constants

merge: upstream v1.3.0

2026-04-11 14:06:52 +02:00

context

refactor: kilo compat for v1.3.10

2026-04-12 21:09:24 +02:00

hooks

OpenCode v1.3.4 (#8798)

2026-04-12 13:36:08 +02:00

i18n

resolve merge conflicts

2026-04-13 11:46:32 +02:00

pages

refactor: kilo compat for v1.3.10

2026-04-12 21:09:24 +02:00

testing

refactor: kilo compat for v1.3.10

2026-04-12 21:09:24 +02:00

utils

refactor: kilo compat for v1.3.10

2026-04-12 21:09:24 +02:00

app.tsx

OpenCode v1.3.4 (#8798)

2026-04-12 13:36:08 +02:00

custom-elements.d.ts

chore: rename packages/desktop -> packages/app

2025-12-22 19:39:00 -06:00

entry.tsx

refactor: kilo compat for v1.3.10

2026-04-12 21:09:24 +02:00

env.d.ts

refactor: kilo compat for v1.3.10

2026-04-12 21:09:24 +02:00

index.css

fix(app): better review/filetree empty states (#16221)

2026-03-06 15:39:31 -06:00

index.ts

merge: upstream v1.3.0

2026-04-11 14:06:52 +02:00

sst-env.d.ts

Resolve merge conflicts

2026-02-23 20:12:28 +01:00

theme-preload.test.ts

fix(app): remove oc-1 theme

2026-03-19 19:43:44 +01:00