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
Core	Scope: refactoring	2020-10-19 18:53:15 +03:00
Models	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00
Properties	Common nlog config	2019-11-15 11:47:56 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	References updated	2020-10-16 10:27:44 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	Autofac: fix	2020-11-02 19:27:08 +03:00
Startup.cs	Merge branch 'develop' into refactoring/scope	2020-11-13 16:03:17 +03:00