AlexeySafronov 72527ccded Merge branch 'master' into develop ... # Conflicts: # lerna.json # package.json # packages/asc-web-common/package.json # packages/asc-web-components/package.json # products/ASC.CRM/Client/package.json # products/ASC.Calendar/Client/package.json # products/ASC.Files/Client/package.json # products/ASC.Mail/Client/package.json # products/ASC.People/Client/package.json # products/ASC.Projects/Client/package.json # web/ASC.Web.Client/package.json # web/ASC.Web.Editor/package.json # web/ASC.Web.Login/package.json		2021-05-29 21:57:42 +03:00
..
public	Web: Editor/Files: Deleted conditions for Edit & Fixed url to folder where the file is located.	2021-03-29 19:31:11 +03:00
src	Web: Editor: Fixed shell name	2021-05-20 14:21:26 +03:00
.babelrc	Web: Added new @appserver/editor app	2021-03-05 21:15:48 +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 'master' into develop	2021-05-29 21:57:42 +03:00
webpack.config.js	Web: Fix login redirect on Editor not authorized link opening	2021-04-30 18:01:16 +03:00