Artem Tarasov 43491f42a9 Merge branch 'develop' into feature/thumbnails ... # Conflicts: # products/ASC.Files/Client/src/Files.jsx # 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 # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/store/InitFilesStore.js		2021-04-05 10:54:27 +03:00
..
asc-web-common	Merge branch 'develop' into feature/thumbnails	2021-04-05 10:54:27 +03:00
asc-web-components	Merge branch 'develop' into feature/thumbnails	2021-04-05 10:54:27 +03:00