Commit Graph

1 Commits (0aff8dfca64d08cc9824d3ed1459a0e7cc734a48)

Author SHA1 Message Date
Deepak Prabhakara 40e915b5f1 Merge branch 'main' into feature/copy-add-identity-provider
# Conflicts:
#	pages/api/auth/[...nextauth].tsx
#	pages/api/auth/forgot-password.ts
#	pages/settings/security.tsx
#	prisma/schema.prisma
#	public/static/locales/en/common.json
2021-11-10 12:34:40 +00:00