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
..
AuthManager.cs	DI: configuration	2019-09-24 13:32:12 +03:00
AuthorizationManager.cs	DI: TenantManager	2019-09-17 11:07:46 +03:00
CoreConfiguration.cs	DI: configuration	2019-09-23 15:20:08 +03:00
PaymentManager.cs	DI: configuration	2019-09-23 15:20:08 +03:00
SubscriptionManager.cs	DI TenantManager	2019-09-20 15:20:03 +03:00
TenantManager.cs	DI: CoreSettings	2019-09-18 18:19:30 +03:00
UserManager.cs	Merge branch 'master' into refactoring/di	2019-09-25 18:56:28 +03:00