AlexeySafronov f675415228 Merge branch 'master' into release/v1.1.0 ... # 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/public/locales/en/SelectFile.json # products/ASC.Files/Client/public/locales/en/SelectFolder.json # products/ASC.Files/Client/public/locales/en/Translations.json # products/ASC.Files/Client/public/locales/ru/Translations.json # products/ASC.Files/Client/src/components/Article/MainButton/index.js # products/ASC.Mail/Client/package.json # products/ASC.People/Client/package.json # products/ASC.People/Client/public/locales/en/Translations.json # products/ASC.People/Client/public/locales/ru/Translations.json # products/ASC.People/Client/src/components/Article/MainButton/index.js # products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js # 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:26:20 +03:00
..
images	Web: Files: Added blank actions for form file. Added form action icons. Added en translation key`s for action buttons.	2021-11-16 16:40:27 +03:00
locales	Merge branch 'master' into release/v1.1.0	2021-11-21 14:26:20 +03:00
index.html	Web: fixed header height	2021-10-06 12:22:28 +03:00