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
..
Core	Files: optimization	2020-11-30 23:02:10 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
Thumbnail	Merge branch 'master' into release/v1.1.0	2021-11-21 14:26:20 +03:00
appsettings.json	Files: service replaced	2020-04-27 20:02:15 +03:00
ASC.Files.Service.csproj	RazorCompileOnBuild:false<	2021-06-16 20:08:26 +03:00
feed.json	Files: feed. FoldersModule	2020-06-04 19:36:43 +03:00
Program.cs	Files: added feature for remove elastic	2021-11-01 17:31:22 +03:00
search.json	fix	2020-07-16 16:02:21 +03:00