DocSpace-buildtools/products/ASC.Mail/Client
AlexeySafronov febf172875 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/avatar-editor/index.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/main-button/index.js
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Server/DocStore
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Login/package.json
2021-12-28 13:35:02 +03:00
..
public edit translations 2021-12-14 13:17:23 +03:00
src Web: SW: Added SW unregister + refactoring 2021-11-25 15:08:18 +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 hotfix/v1.1.1 2021-12-28 13:35:02 +03:00
webpack.config.js Web: init e2e tests 2021-12-21 15:59:11 +08:00