AlexeySafronov 11d527ba03 Merge branch 'master' into hotfix/v1.1.1 ... # Conflicts: # lerna.json # packages/asc-web-common/package.json # 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/store/FilesActionsStore.js # products/ASC.Files/Client/src/store/UploadDataStore.js # 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-11-21 14:40:24 +03:00
..
public	Web: Removed duplicates	2021-09-24 21:18:50 +03:00
src	Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language.	2021-11-10 19:59:03 +03:00
.babelrc
.gitattributes
.gitignore
Dockerfile
jsconfig.json	Web: applied new import from appserver/components	2021-02-24 20:11:23 +03:00
package.json	bump version to 1.1.1	2021-11-12 15:21:25 +03:00
webpack.config.js	Web: Moved other common dependencies to sharedDependencies.js	2021-09-13 12:29:44 +03:00