merge: resolve conflicts with main (v0.11.5.0 → v0.11.5.1)

VERSION and CHANGELOG conflicts resolved: our inline office-hours
feature rebased on top of main's v0.11.5.0 (Bash Compatibility Fix).
This commit is contained in:
Garry Tan
2026-03-22 21:04:16 -07:00
30 changed files with 82 additions and 45 deletions
+1 -1
View File
@@ -1 +1 @@
0.11.4.1
0.11.5.1