Files
zeekay 04ef45baf3 merge: upstream/master (pocketbase, brand preserved with -X ours + accept-our-deletes)
Hanzo Base diverged from upstream pocketbase via:
- Replaced ui/ (Vue admin) with @hanzo/gui React shell
- Dropped legacy test fixtures
- Kept upstream Go backend changes (db, auth, hooks)

Conflicts resolved: UU/UA/AU → ours, UD/DD → drop (we deleted), DU → theirs (they restored).
2026-06-02 10:19:06 -07:00
..