Akmal Isomadinov 4725272d39 Merge branch 'feature/form-room-new-icons' into feature/form-room ... # Conflicts: # packages/client/public/locales/en/EmptyView.json # packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.helpers.tsx # packages/client/src/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.tsx # packages/shared/components/empty-view/EmptyView.styled.ts # public/images/emptyview/upload.device.pdf.form.svg # public/images/emptyview/upload.pdf.form.svg		2024-05-29 21:14:25 +05:00
..
client	Merge branch 'feature/form-room-new-icons' into feature/form-room	2024-05-29 21:14:25 +05:00
doceditor	Doceditor:Components:SelectFolderDialog: enable create folder	2024-05-28 12:09:20 +03:00
login	Merge branch 'develop' into feature/editor-in-same-tab	2024-05-27 16:31:42 +04:00
management	Merge branch 'develop' into feature/editor-in-same-tab	2024-05-27 16:31:42 +04:00
shared	Merge branch 'feature/form-room-new-icons' into feature/form-room	2024-05-29 21:14:25 +05:00