AlexeySafronov 1ca554f82d Merge branch 'develop' into release/1.0.0 ... # Conflicts: # packages/asc-web-components/campaigns-banner/index.js # web/ASC.Web.Client/src/Shell.jsx		2021-09-15 14:45:33 +03:00
..
AppServerConfig.js	Added New Proxy settings	2021-04-05 15:49:02 +03:00
index.js	Fixed Bug 52443 - Client.Files. Fixed downloadAs action	2021-09-13 11:09:59 +03:00
sharedDependencies.js	Web: Moved other common dependencies to sharedDependencies.js	2021-09-13 12:29:44 +03:00