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: fixed header height	2021-10-06 12:22:28 +03:00
src	Web: Crm: Changed i18n config	2021-11-10 21:27:02 +03:00
.babelrc	Big Fix commit:	2021-03-22 00:34:21 +03:00
.env	Big Fix commit:	2021-03-22 00:34:21 +03:00
.gitignore	Big Fix commit:	2021-03-22 00:34:21 +03:00
analyse.js	Big Fix commit:	2021-03-22 00:34:21 +03:00
Dockerfile	Big Fix commit:	2021-03-22 00:34:21 +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