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
..
control-btn.js	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00
duration.js	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00
image-viewer.js	Merge branch 'master' into hotfix/v1.1.1	2021-11-21 14:40:24 +03:00
progress.js	Web: Common: fix after merge, fix imports and hierarchy	2021-02-25 17:20:11 +03:00
scroll-button.js	Web: Common: fixed MediaViewer styles	2021-05-06 12:52:19 +03:00
video-viewer.js	Web: Common: changed media-viewer icons, fixed media styles	2021-11-02 17:51:44 +03:00