Alexey Safronov 99105f5d73 Merge branch 'develop' into component-tooltips ... # Conflicts: # packages/asc-web-components/icon-button/index.js # products/ASC.Files/Client/public/locales/de/Article.json # products/ASC.Files/Client/public/locales/de/Translations.json # products/ASC.Files/Client/public/locales/en/Article.json # products/ASC.Files/Client/public/locales/en/Translations.json # products/ASC.Files/Client/public/locales/fr/Article.json # products/ASC.Files/Client/public/locales/fr/Translations.json # products/ASC.Files/Client/public/locales/it/Article.json # products/ASC.Files/Client/public/locales/it/Translations.json # products/ASC.Files/Client/public/locales/pt-BR/Article.json # products/ASC.Files/Client/public/locales/pt-BR/Translations.json # products/ASC.Files/Client/public/locales/ro/Article.json # products/ASC.Files/Client/public/locales/ro/Translations.json # products/ASC.Files/Client/public/locales/ru/Article.json # products/ASC.Files/Client/public/locales/ru/Translations.json # products/ASC.Files/Client/public/locales/sk/Article.json # products/ASC.Files/Client/public/locales/sk/Translations.json		2022-01-20 15:45:24 +03:00
..
Controllers	Files: moved from feature/editor-version-history	2021-12-08 15:25:39 +03:00
DocStore@2bb4d878b4	Merge branch 'develop' into component-tooltips	2022-01-20 15:45:24 +03:00
Helpers	Merge branch 'master' into develop	2021-12-28 18:21:44 +03:00
Properties	refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile	2021-04-16 19:33:26 +03:00
appsettings.json	Files: Startup	2020-02-12 13:48:58 +03:00
ASC.Files.csproj	refactoring	2022-01-13 22:17:56 +03:00
ProductEntryPoint.cs	Api: modules. Added info method	2021-01-25 17:37:26 +03:00
Program.cs	add *.dll for support redis + update Grpc.* dll	2021-12-23 16:17:31 +03:00
Startup.cs	add *.dll for support redis + update Grpc.* dll	2021-12-23 16:17:31 +03:00