Merge branch 'main' into 'develop'
# Conflicts: # src/components/App/index.tsx # src/components/palmistry/discount-screen/discount-screen.css # src/components/palmistry/discount-screen/discount-screen.tsx # src/components/palmistry/payment-screen/payment-screen.tsx # src/components/palmistry/premium-bundle-screen/premium-bundle-screen.css # src/components/palmistry/premium-bundle-screen/premium-bundle-screen.tsx # src/components/palmistry/step-email/step-email.tsx # src/components/palmistry/step-paywall/step-paywall.tsx # src/components/palmistry/steps-manager/steps-manager.tsx # src/routes.ts
This commit is contained in:
commit
87a80598b0