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
..
images	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00
locales	Merge branch 'develop' into feature/backup	2022-02-25 16:05:43 +03:00
index.html	Web: init e2e tests	2021-12-21 15:59:11 +08:00