pavelbannov 868492b562 Merge branch 'develop' into feature/backend-refactor ... # Conflicts: # common/ASC.Common/Threading/DistributedTaskQueue.cs # common/ASC.Core.Common/Billing/BillingClient.cs # common/ASC.Core.Common/Billing/TariffService.cs # common/ASC.Core.Common/Notify/Context.cs # common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs # common/ASC.FederatedLogin/Helpers/RequestHelper.cs # common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs # common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs # common/services/ASC.Studio.Notify/Program.cs # common/services/ASC.Webhooks.Service/WebhookSender.cs # products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs # products/ASC.Files/Core/Helpers/DocuSignHelper.cs # products/ASC.Files/Core/Helpers/EasyBibHelper.cs # products/ASC.Files/Core/Helpers/WordpressHelper.cs # products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs # products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs # products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs # products/ASC.Files/Core/ThirdPartyApp/Token.cs # products/ASC.Files/Server/Controllers/FilesController.cs		2022-03-19 22:16:03 +03:00
..
ASC.Calendar	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00
ASC.CRM	Merge branch 'develop' into feature/backend-refactor	2022-03-19 22:16:03 +03:00
ASC.Files	Merge branch 'develop' into feature/backend-refactor	2022-03-19 22:16:03 +03:00
ASC.Mail	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00
ASC.People	Merge branch 'develop' into feature/backend-refactor	2022-03-19 22:16:03 +03:00
ASC.Projects	Merge branch 'master' into develop	2022-02-21 22:22:38 +03:00