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
This commit is contained in:
commit
daec6325b6
@ -84,4 +84,4 @@ function BirthdayPage(): JSX.Element {
|
||||
);
|
||||
}
|
||||
|
||||
export default BirthdayPage;
|
||||
export default BirthdayPage;
|
||||
@ -45,4 +45,4 @@ function BirthPlacePage() {
|
||||
);
|
||||
}
|
||||
|
||||
export default BirthPlacePage;
|
||||
export default BirthPlacePage;
|
||||
@ -461,4 +461,4 @@ export const getRouteBy = (status: UserStatus): string => {
|
||||
}
|
||||
};
|
||||
|
||||
export default routes;
|
||||
export default routes;
|
||||
Loading…
Reference in New Issue
Block a user