Artem Tarasov 54b96e8aa0 Merge branch 'develop' into feature/thumbnails ... # Conflicts: # packages/asc-web-common/components/PageLayout/sub-components/SelectedFrame.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js		2021-04-15 15:05:15 +03:00
..
asc-web-common	Merge branch 'develop' into feature/thumbnails	2021-04-15 15:05:15 +03:00
asc-web-components	Merge branch 'develop' into feature/thumbnails	2021-04-15 15:05:15 +03:00