AlexeySafronov 8cc08045b7 Merge branch 'master' into develop ... # Conflicts: # packages/asc-web-common/components/PageLayout/sub-components/section-header.js # packages/asc-web-components/combobox/index.js # packages/asc-web-components/table-container/StyledTableContainer.js # packages/asc-web-components/table-container/TableGroupMenu.js # packages/asc-web-components/table-container/TableHeader.js # products/ASC.Files/Client/src/pages/Home/Section/Header/index.js # products/ASC.Files/Client/src/store/FilesStore.js # products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs		2021-11-01 13:54:40 +03:00
..
Core	Files: optimization	2020-11-30 23:02:10 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
Thumbnail	Merge branch 'master' into develop	2021-11-01 13:54:40 +03:00
appsettings.json	Files: service replaced	2020-04-27 20:02:15 +03:00
ASC.Files.Service.csproj	Added solution filter	2021-10-25 14:29:36 +03:00
feed.json	Files: feed. FoldersModule	2020-06-04 19:36:43 +03:00
Program.cs	BuildAndDeploy	2021-09-23 20:58:39 +03:00
search.json	fix	2020-07-16 16:02:21 +03:00