a tool for shared writing and social publishing
Something went wrong. Try again.
Merge main into feature/analytics master
Resolve merge conflicts: - AccountSettings.tsx: keep expanded settings menu with Pro subscription - inngest/route.tsx: include both stripe functions and sync_document_metadata - ProfileHeader.tsx: trivial whitespace conflict - Install missing @yornaath/batshit dependency from main Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Author Jared Pereira Co-author Claude Opus 4.6 Date (Feb 25, 2026, 10:28 PM UTC) Commit 0db529d5 0db529d5e1c6589e3d719985a7428c07cb4be36f Parent 03dbdba1 03dbdba151e1a1c1f18d348c0fbb60c97e29343b