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
..
Auth	analizators/s1118	2022-01-21 13:47:56 +03:00
Convention	added ControllerNameAttributeConvention	2021-04-02 18:46:00 +03:00
Core	fixed warnings	2022-02-07 20:19:58 +03:00
Middleware	Merge branch 'develop' into feature/backup	2022-02-25 16:05:43 +03:00
Model	analizators/U2U1202	2022-01-18 16:54:24 +03:00
Routing	analizators/s3442	2022-01-24 12:57:01 +03:00
ASC.Api.Core.csproj	Packages updated	2022-02-02 19:54:23 +03:00