pavelbannov 8ca88e4620 Merge branch 'develop' into feature/net6 ... # Conflicts: # common/ASC.Api.Core/Core/BaseStartup.cs # common/ASC.Common/ASC.Common.csproj # products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj # products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs # products/ASC.Files/Server/ASC.Files.csproj # web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj		2021-11-23 16:40:50 +03:00
..
GroupController.cs	People: added method to get groups with members	2021-02-03 13:48:52 +03:00
PeopleController.cs	Merge branch 'develop' into feature/net6	2021-11-23 16:40:50 +03:00