Igor Lobanov
|
5bcef1d1e2
|
Merge remote-tracking branch 'origin/dev' into editor
# Conflicts:
# src/components/Feed/Row3.tsx
# src/components/Nav/AuthModal/EmailConfirm.tsx
# src/components/Nav/AuthModal/ForgotPasswordForm.tsx
# src/components/Nav/AuthModal/LoginForm.tsx
# src/components/Nav/AuthModal/RegisterForm.tsx
# src/components/Nav/AuthModal/index.tsx
# src/components/Nav/Header.tsx
# src/components/Nav/Modal.tsx
# src/components/Nav/Popup.tsx
# src/components/Nav/Private.tsx
# src/components/Root.tsx
# src/components/Topic/Card.tsx
# src/components/Views/AllAuthors.tsx
# src/components/Views/Author.tsx
# src/components/Views/Home.tsx
# src/components/Views/Topic.tsx
# src/graphql/mutation/auth-confirm-email.ts
# src/locales/ru.json
# src/pages/welcome.astro
# src/stores/auth.ts
# src/stores/ui.ts
# src/stores/zine/authors.ts
# src/utils/apiClient.ts
# src/utils/config.ts
|
2022-10-31 14:06:32 +01:00 |
|
