pavelbannov 0bbc383266 Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs # common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Core/Notify/StudioNotifyService.cs		2019-10-30 11:45:55 +03:00
..
Controllers	Merge branch 'master' into refactoring/di	2019-10-30 11:45:55 +03:00
Models	DI: log	2019-10-17 18:55:35 +03:00
Properties	Getting STORAGE_ROOT from env variable	2019-09-09 18:04:28 +03:00
appsettings.json	External config	2019-06-21 11:03:42 +03:00
ASC.Web.Api.csproj	.net core up to 3.0.0	2019-09-24 14:20:58 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
nlog.config	Added autofac and nlog	2019-05-28 18:05:20 +03:00
Program.cs	kafka disabled by default	2019-08-23 15:49:23 +03:00
Startup.cs	Revert "removed ConfigurationManager"	2019-10-22 16:48:48 +03:00