pavelbannov 3a747ef8e4 Merge branch 'master' into feature/system-json ... # Conflicts: # common/ASC.Api.Core/Core/ApiContext.cs # common/ASC.Api.Core/Core/ApiDateTime.cs # common/ASC.Api.Core/Model/EmployeeWraper.cs # common/ASC.Api.Core/Model/EmployeeWraperFull.cs # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Context/Impl/UserManager.cs # products/ASC.People/Server/Models/GroupWrapperFull.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Api/Models/BuildVersion.cs		2020-05-07 10:28:20 +03:00
..
GroupModel.cs	People: added group model	2019-09-20 13:43:13 +03:00
GroupWrapperFull.cs	Merge branch 'master' into feature/system-json	2020-05-07 10:28:20 +03:00
MemberModel.cs	Web: People: Implemented opportunity to change culture in Profile	2019-09-29 13:50:18 +03:00
SetManagerModel.cs	People: added group model	2019-09-20 13:43:13 +03:00
ThumbnailsDataWrapper.cs	Replaced NewtonsoftJson with System.Text.Json	2020-02-21 16:19:32 +03:00
ThumbnailsModel.cs	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
TransferGroupMembersModel.cs	People: added group model	2019-09-20 13:43:13 +03:00
UpdateMembersModel.cs	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
UploadPhotoModel.cs	People: deleted unused code	2019-12-09 15:59:34 +03:00