pavelbannov de16476542 Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Api.Core/Core/ApiContext.cs # common/ASC.Core.Common/Context/SecurityContext.cs # products/ASC.People/Server/Controllers/PeopleController.cs # web/ASC.Web.Core/Users/UserPhotoManager.cs		2019-09-16 15:35:44 +03:00
..
Import	IDE0054, IDE0056, IDE0057, IDE1005	2019-08-15 17:48:55 +03:00
CustomNamingPeople.cs	DI: BaseSettings	2019-09-13 14:18:27 +03:00
DisplayUserSettings.cs	DI: BaseSettings	2019-09-13 14:18:27 +03:00
UserHelpTourSettings.cs	DI: BaseSettings	2019-09-13 14:18:27 +03:00
UserInfoComparer.cs	IDE0007	2019-08-15 16:03:57 +03:00
UserInfoExtension.cs	revert f85711b736	2019-09-12 14:34:58 +03:00
UserManagerWrapper.cs	DI: BaseSettings	2019-09-13 14:18:27 +03:00
UserPhotoManager.cs	Merge branch 'master' into refactoring/di	2019-09-16 15:35:44 +03:00
UserPhotoThumbnailManager.cs	revert f85711b736	2019-09-12 14:34:58 +03:00
UserPhotoThumbnailSettings.cs	DI: BaseSettings	2019-09-13 14:18:27 +03:00
UserSortOrder.cs	Added ASC.Web.Core	2019-06-07 11:59:07 +03:00