Merge branch 'main' into 'develop'

Browse Source

# Conflicts:
#   src/components/App/index.tsx
#   src/components/BirthdayPage/index.tsx
#   src/components/pages/BirthPlacePage/index.tsx
#   src/routes.ts

...

This commit is contained in:

Daniil Chemerkin 2024-04-17 23:29:42 +00:00

parent 9383060a7c 95dee0b868

commit daec6325b6

3 changed files with 3 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files