pavelbannov 710a3f62fa Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Common/ASC.Common.csproj # common/ASC.Core.Common/ASC.Core.Common.csproj # common/ASC.Core.Common/Context/Impl/UserManager.cs # products/ASC.People/Server/Controllers/PeopleController.cs		2019-09-25 18:56:28 +03:00
..
Controllers	DI: configuration	2019-09-24 13:32:12 +03:00
Models	DI: configuration	2019-09-24 13:32:12 +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	DI: WebImageSupplier,WebItemSettings, SettingsManager	2019-09-11 13:42:52 +03:00