Artem Tarasov 73a0c6b637 Merge branch 'develop' into feature/doceditor-ssr ... # Conflicts: # web/ASC.Web.Client/src/components/pages/Home/index.js # web/ASC.Web.Editor/src/App.js # yarn.lock		2022-02-22 13:00:33 +03:00
..
AppServerConfig.js	Added New Proxy settings	2021-04-05 15:49:02 +03:00
index.js	Fix Bug 49777 - Docs. The version icon does not appear next to the file name after it has been created and edited.	2022-02-10 19:49:44 +03:00
sharedDependencies.js	Web: Common: added eager relations for some shared dependencies (mf ssr fix)	2022-02-16 14:16:04 +03:00