Daniil Chemerkin daec6325b6 Merge branch 'main' into 'develop' ... # Conflicts: # src/components/App/index.tsx # src/components/BirthdayPage/index.tsx # src/components/pages/BirthPlacePage/index.tsx # src/routes.ts		2024-04-17 23:29:42 +00:00
..
index.tsx	Merge branch 'main' into 'develop'	2024-04-17 23:29:42 +00:00
styles.css	Base markup has been added	2023-05-02 19:05:24 +06:00