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
..
Classes	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
Controllers	Scope: refactoring	2020-10-19 18:53:15 +03:00
Interfaces	Added ASC.ApiSystem.csproj	2020-02-19 16:19:10 +03:00
Models	x-www-form-urlencoded: add models	2020-11-10 13:41:32 +03:00
Properties	Added ASC.ApiSystem.csproj	2020-02-19 16:19:10 +03:00
appsettings.json	ApiSystem: fix autofac	2020-05-20 16:06:35 +03:00
ASC.ApiSystem.csproj	Nuget: replaced thirdparty	2020-08-20 17:50:08 +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