Commit Graph

2 Commits

Author SHA1 Message Date
bniwredyc
c4ec7d0a7e Merge remote-tracking branch 'gitlab/dev' into drafts
# Conflicts:
#	src/components/Editor/Editor.tsx
#	src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.module.scss
#	src/components/Editor/EditorFloatingMenu/EditorFloatingMenu.tsx
#	src/components/Editor/EditorFloatingMenu/Menu/Menu.tsx
#	src/components/Editor/UploadModal/UploadModalContent.tsx
2023-05-04 21:57:02 +02:00
bniwredyc
cfb744c0a0 lint 2023-05-01 20:32:32 +02:00