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
..
AuthenticationController.cs	Merge branch 'develop' into feature/async	2022-02-12 00:51:48 +03:00
CapabilitiesController.cs	analizators/U2U1115	2022-01-17 11:22:52 +03:00
LdapController.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ModulesController.cs	Api: modules. Added info method	2021-01-25 17:37:26 +03:00
PortalController.cs	Merge branch 'develop' into feature/async	2022-02-12 00:51:48 +03:00
SecurityController.cs	analizators/U2U1115	2022-01-17 11:22:52 +03:00
SettingsController.cs	Merge branch 'develop' into feature/backup	2022-02-25 16:05:43 +03:00
SmtpSettingsController.cs	analizators/ca1507	2022-01-24 13:49:00 +03:00
SsoSettingsV2Controller.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ThirdPartyController.cs	analizators/U2U1103	2022-01-13 15:53:57 +03:00