merge: resolve conflicts with main (v0.11.4.0 → v0.11.4.1)

VERSION and CHANGELOG conflicts resolved: our inline office-hours
feature rebased on top of main's v0.11.4.0 (Codex in Office Hours).
This commit is contained in:
Garry Tan
2026-03-22 20:55:06 -07:00
6 changed files with 246 additions and 2 deletions
+1 -1
View File
@@ -1 +1 @@
0.11.3.1
0.11.4.1