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
..
Controllers	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
DocStore	Files: core. replace	2020-07-28 15:45:14 +03:00
Helpers	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
Properties	Files: Startup	2020-02-12 13:48:58 +03:00
appsettings.json	Files: Startup	2020-02-12 13:48:58 +03:00
ASC.Files.csproj	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
ProductEntryPoint.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
Program.cs	Autofac: fix	2020-11-02 19:27:08 +03:00
Startup.cs	Merge branch 'develop' into refactoring/scope	2020-11-10 11:42:50 +03:00