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
..
About.json	Web: Restored missing 'ru' translations	2021-11-12 21:14:44 +03:00
Confirm.json	translations	2021-11-12 19:00:01 +03:00
Error401.json	Web: Rewritten all json translation files with sorting of properties alphabetically	2021-05-31 18:34:15 +03:00
Error403.json	Web: Rewritten all json translation files with sorting of properties alphabetically	2021-05-31 18:34:15 +03:00
Error404.json	Web: Rewritten all json translation files with sorting of properties alphabetically	2021-05-31 18:34:15 +03:00
Home.json	Web: Studio: Homepage: Now displayName is used in greeting message	2021-12-14 11:14:08 +03:00
NavMenu.json	Web: Rewritten all json translation files with sorting of properties alphabetically	2021-05-31 18:34:15 +03:00
Offline.json	Web: Rewritten all json translation files with sorting of properties alphabetically	2021-05-31 18:34:15 +03:00
PaymentsEnterprise.json	Web: Rewritten all json translation files with sorting of properties alphabetically	2021-05-31 18:34:15 +03:00
Settings.json	Web: Fix translations	2021-12-22 18:12:04 +03:00
ThirdParty.json	Web: Rewritten all json translation files with sorting of properties alphabetically	2021-05-31 18:34:15 +03:00
ToastHeaders.json	Web: Rewritten all json translation files with sorting of properties alphabetically	2021-05-31 18:34:15 +03:00
translation.json	Web: Rewritten all json translation files with sorting of properties alphabetically	2021-05-31 18:34:15 +03:00
Wizard.json	Web: Fix translations	2021-12-22 18:12:04 +03:00