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
..
fonts	Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF	2021-07-27 15:56:19 +03:00
images	Merge branch 'master' into release/v1.1.0	2021-11-21 14:26:20 +03:00
locales	Merge branch 'master' into release/v1.1.0	2021-11-21 14:26:20 +03:00
offline	Web: Removed duplicates	2021-09-24 21:18:50 +03:00
scripts	Web: added tiff script	2021-08-19 13:27:44 +03:00
thirdparty	Web: Fixed callback pages, added login callback for desktop client	2021-10-19 10:31:34 +03:00
appIcon.png	PWA: renamed images for pwa	2019-12-11 15:18:55 +03:00
bg-error.png	PWA: renamed images for pwa	2019-12-11 15:18:55 +03:00
favicon.ico	Web: Removed duplicates	2021-09-24 21:18:50 +03:00
manifest.json	PWA: renamed images for pwa	2019-12-11 15:18:55 +03:00