Overview
| Comment: | Merge trunk |
|---|---|
| Timelines: | family | ancestors | descendants | both | people-seen-fold |
| Files: | files | file ages | folders |
| SHA3-256: |
6a5e035452c6aa9a87530188817c0adc |
| User & Date: | zeitgeist on 2026-10-08 22:52:04.453 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-08
| ||
| 23:21 | land people-seen-fold check-in: 76755ebd6f user: dmestas tags: trunk | |
| 22:52 | Merge trunk closed check-in: 6a5e035452 user: zeitgeist tags: people-seen-fold | |
| 22:44 | land own-lane check-in: 83dd42c52e user: dmestas tags: trunk | |
| 21:51 | People tab: accounts stack into cards on a phone, row actions wrap check-in: bbc6b28a47 user: zeitgeist tags: people-seen-fold | |
Changes
Modified docs/api.md
from [3b7bc02e70]
to [df0d3e9e7a].
[diff]
Modified internal/api/landingconflicts.go
from [b8114eb7ac]
to [388ae009bd].
[diff]
Modified internal/api/landingresolve.go
from [4c326fb2a7]
to [f1803eca7c].
[diff]
Modified internal/api/landingresolve_test.go
from [f7fed717f0]
to [aad1287438].
[diff]
Modified internal/api/mergepair.go
from [3966e49480]
to [255371274e].
[diff]
Modified internal/web/meld.go
from [08d0db5f9a]
to [7a20826897].
[diff]
Modified internal/web/mergepage.go
from [7ae731e599]
to [a8a109b615].
[diff]
Modified internal/web/mergepage_test.go
from [c7e3da1468]
to [593b6acfb5].
[diff]
Modified internal/web/stylesheet.go
from [efe974262f]
to [613ab177ef].
[diff]
Modified internal/web/timeline.go
from [33376ace77]
to [0c48f8b827].
[diff]
Modified internal/web/timeline_test.go
from [ca56fa7dfb]
to [3fb1487b7c].
[diff]
Modified internal/web/web.go
from [f878e9a2ec]
to [588b56ee05].
[diff]
Modified internal/zitcli/mergeregions_test.go
from [af6827f7e7]
to [600b2d015e].
[diff]