Artem Tarasov 2ef94f75da Merge branch 'develop' into feature/doceditor-ssr ... # Conflicts: # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # web/ASC.Web.Editor/package.json # web/ASC.Web.Editor/src/Editor.jsx # web/ASC.Web.Editor/webpack.config.js # yarn.lock		2022-07-01 23:41:10 +03:00
..
public	Fixed Bug 57327: Wrong size of icon on mobile shortcut	2022-05-27 14:58:32 +03:00
src	Web: Doceditor: refactoring, changed hierarchy, added hmr, global styles	2022-07-01 23:33:35 +03:00
webpack	Web: Doceditor: refactoring, changed hierarchy, added hmr, global styles	2022-07-01 23:33:35 +03:00
.babelrc	Web: Doceditor: refactoring, changed hierarchy, added hmr, global styles	2022-07-01 23:33:35 +03:00
.gitattributes	Web: Added new @appserver/editor app	2021-03-05 21:15:48 +03:00
.gitignore	Web: Added new @appserver/editor app	2021-03-05 21:15:48 +03:00
Dockerfile	Web: Added new @appserver/editor app	2021-03-05 21:15:48 +03:00
jsconfig.json	Web: Added new @appserver/editor app	2021-03-05 21:15:48 +03:00
package.json	Merge branch 'develop' into feature/doceditor-ssr	2022-07-01 23:41:10 +03:00