pavelbannov 08db3b32b3 Merge branch 'master' into feature/ef ... # Conflicts: # common/ASC.Common/ASC.Common.csproj # common/ASC.Core.Common/ASC.Core.Common.csproj # common/ASC.Resource.Manager/ASC.Resource.Manager.csproj # web/ASC.Web.Api/ASC.Web.Api.csproj		2019-12-06 12:25:18 +03:00
..
Controllers	EF: DbTenantService	2019-12-03 18:20:21 +03:00
Models	Web: Client: added lazy loader to tabs, added ownerId to settings controller	2019-11-15 10:19:37 +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	.net core up to 3.1	2019-12-06 12:12:51 +03:00
ASC.Web.Api.sln	init commit	2019-05-15 17:56:09 +03:00
Program.cs	Common nlog config	2019-11-15 11:47:56 +03:00
Startup.cs	Common nlog config	2019-11-15 11:47:56 +03:00