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
..
Controllers	Merge branch 'master' into develop	2021-11-01 13:54:40 +03:00
Core	WebStudio: resources	2021-05-27 21:30:15 +03:00
Models	Personal: fix quota	2021-10-14 13:47:12 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	Added solution filter	2021-10-25 14:29:36 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	Added asp logging	2021-08-08 16:19:54 +03:00
Startup.cs	Log: fix configuring	2021-07-13 21:17:18 +03:00