Artem Tarasov 5d2264d483 Merge branch 'develop' into feature/thumbnails ... # Conflicts: # products/ASC.Files/Client/src/components/EditingWrapperComponent.js # products/ASC.Files/Client/src/components/FileItem.js # products/ASC.Files/Client/src/components/FilesContainer.js # products/ASC.Files/Client/src/components/FilesContent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js # products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js # products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js # products/ASC.Files/Client/src/components/sub-components/Badges.js # products/ASC.Files/Client/src/components/sub-components/EditingWrapperComponent.js # products/ASC.Files/Client/src/components/sub-components/Icons.js # products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js # products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleRowContent.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/BadgesFileTile.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/SimpleTileContent.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js # products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContent.js # products/ASC.Files/Client/src/pages/Home/Section/Body/index.js # products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js		2021-04-27 13:40:38 +03:00
..
Client	Merge branch 'develop' into feature/thumbnails	2021-04-27 13:40:38 +03:00
Core	Merge branch 'develop' into bugfix/thirdparty	2021-04-27 11:25:30 +03:00
Server	Merge branch 'master' into develop	2021-04-19 18:52:56 +03:00
Service	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
Tests	Files: fix tests	2021-04-07 18:08:15 +03:00