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	Applied last changes in Mail/Calendar ComingSoon pages	2021-04-21 22:03:49 +03:00
src	Web: Moved custom.scss to @appserver/common	2021-05-19 11:14:44 +03:00
.babelrc	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00
.env	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00
.gitignore	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00
analyse.js	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00
Dockerfile	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00
package.json	Merge branch 'master' into develop	2021-05-29 21:57:42 +03:00
webpack.config.js	Web: Init Mail/Calendar Comming Soon pages	2021-04-12 13:41:16 +03:00