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
..
ApiContext.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
ApiDateTime.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
BaseStartup.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
CustomEndpointDataSource.cs	Files: thirdparty fix	2020-03-16 11:25:39 +03:00
ItemDictionary.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ItemKeyValuePair.cs	Replaced NewtonsoftJson with System.Text.Json	2020-02-21 16:19:32 +03:00
Module.cs	fix	2020-08-27 17:01:37 +03:00
Update.cs	Api: Update	2020-04-20 15:54:13 +03:00
Validate.cs	Added NullIfDefault	2020-07-02 18:15:52 +03:00
XmlOutputFormatter.cs	Api: fields	2019-08-02 17:40:33 +03:00