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
..
AppServerConfig.js	Added New Proxy settings	2021-04-05 15:49:02 +03:00
index.js	Merge branch 'develop' into feature/backup	2022-02-25 16:05:43 +03:00
sharedDependencies.js	Web: Moved other common dependencies to sharedDependencies.js	2021-09-13 12:29:44 +03:00