Alexey Safronov f07aa0a183 Merge branch 'develop' into feature/backup ... # Conflicts: # common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs # config/nginx/onlyoffice.conf # packages/asc-web-common/constants/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/webpack.config.js # web/ASC.Web.Api/Models/SettingsWrapper.cs # web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js		2022-02-25 16:05:43 +03:00
..
Controllers	Merge branch 'develop' into feature/backup	2022-02-25 16:05:43 +03:00
Core	analizators/U2U1025	2022-01-13 14:19:39 +03:00
Models	Merge branch 'develop' into feature/backup	2022-02-25 16:05:43 +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	cache: return support kafka. refactoring	2022-01-27 15:20:51 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	Merge branch 'develop' into feature/analizators	2022-01-31 14:35:16 +03:00
Startup.cs	cache: return support kafka. refactoring	2022-01-27 15:20:51 +03:00