mirror of
https://github.com/better-auth/better-auth.git
synced 2026-07-27 10:55:09 -05:00
Conflicts resolved: - docs/content/docs/plugins/2fa.mdx: kept next's OTP feature, applied main's exported const pattern - docs/content/docs/plugins/oauth-provider.mdx: kept main's formatting, added back private_key_jwt docs - docs/content/docs/plugins/sso.mdx: kept next's version with private_key_jwt and SAML options - packages/sso/src/routes/sso.ts: kept next's version (has security fixes and private_key_jwt)