pavelbannov 79ea471098 Merge branch 'develop' into refactoring/scope ... # Conflicts: # common/ASC.Api.Core/Core/BaseStartup.cs # common/ASC.Core.Common/BaseCommonLinkUtility.cs # common/services/ASC.ApiSystem/Startup.cs # common/services/ASC.Data.Backup/BackupServiceLauncher.cs # common/services/ASC.Data.Backup/Startup.cs # common/services/ASC.Data.Storage.Migration/Program.cs # common/services/ASC.Notify/NotifyServiceLauncher.cs # common/services/ASC.Notify/Program.cs # common/services/ASC.Socket.IO.Svc/Program.cs # common/services/ASC.Studio.Notify/Program.cs # common/services/ASC.Thumbnails.Svc/Program.cs # common/services/ASC.UrlShortener.Svc/Program.cs # products/ASC.Files/Core/Configuration/ProductEntryPoint.cs # products/ASC.Files/Server/Startup.cs # products/ASC.Files/Service/Program.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Api/Controllers/PortalController.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Startup.cs # web/ASC.Web.Studio/Startup.cs		2020-11-04 15:22:43 +03:00
..
Controllers	Refactoring: scope.	2020-10-29 11:13:51 +03:00
Models	Scope: refactoring	2020-10-19 18:53:15 +03:00
Properties	Common nlog config	2019-11-15 11:47:56 +03:00
Resources	Removed unused resources	2019-08-13 16:05:36 +03:00
.gitignore	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
appsettings.json	ASC.People project is divided into two separate parts: Server and Client	2019-07-10 11:21:12 +03:00
ASC.People.csproj	.net core up to 3.1	2019-12-06 12:12:51 +03:00
PeopleProduct.cs	fix	2020-08-27 17:01:37 +03:00
Program.cs	Autofac: fix	2020-11-02 19:27:08 +03:00
Startup.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00