mirror of
https://github.com/documenso/documenso.git
synced 2026-07-08 20:14:58 +10:00
ephraimduncan
5a0f438ee6
# Conflicts: # apps/remix/app/components/general/app-header.tsx # apps/remix/app/components/general/app-nav-desktop.tsx # apps/remix/app/components/general/app-nav-mobile.tsx # apps/remix/app/components/general/folder/folder-card.tsx # apps/remix/app/components/general/folder/folder-grid.tsx # apps/remix/app/components/general/menu-switcher.tsx # apps/remix/app/components/general/org-menu-switcher.tsx # apps/remix/app/components/general/settings-nav-mobile.tsx # apps/remix/app/components/tables/admin-claims-table.tsx # apps/remix/app/components/tables/admin-dashboard-users-table.tsx # apps/remix/app/components/tables/admin-organisations-table.tsx # apps/remix/app/components/tables/documents-table-action-button.tsx # apps/remix/app/components/tables/organisation-email-domains-table.tsx # apps/remix/app/components/tables/templates-table-action-dropdown.tsx # apps/remix/app/components/tables/user-billing-organisations-table.tsx # apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx # apps/remix/app/routes/_authenticated+/admin+/email-domains._index.tsx # apps/remix/app/routes/_authenticated+/admin+/organisations.$id.tsx # apps/remix/app/routes/_authenticated+/dashboard.tsx # apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.webhooks._index.tsx # apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates.$id._index.tsx # packages/email/template-components/template-document-reminder.tsx # packages/ui/primitives/tooltip.tsx