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: Fix login redirect on Editor not authorized link opening	2021-04-30 18:01:16 +03:00
src	Web: Moved custom.scss to @appserver/common	2021-05-19 11:14:44 +03:00
.babelrc	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
.gitattributes	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
.gitignore	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
Dockerfile	web: Added ASC.Web.Login	2020-11-24 13:20:14 +03:00
jsconfig.json	Web: applied new import from appserver/components	2021-02-24 20:11:23 +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