pavelbannov 68483bc979 Merge branch 'develop' into refactoring/scope ... # Conflicts: # common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Startup.cs		2020-11-13 16:03:17 +03:00
..
ASC.ApiSystem	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
ASC.AuditTrail	Scope: refactoring	2020-10-19 18:53:15 +03:00
ASC.Data.Backup	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
ASC.Data.Storage.Encryption	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.Data.Storage.Migration	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.ElasticSearch	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.Feed.Aggregator	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.Notify	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
ASC.Socket.IO.Svc	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.Studio.Notify	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.TelegramService	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.Thumbnails.Svc	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.UrlShortener.Svc	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00