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
..
AuthenticationController.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
CapabilitiesController.cs	Autofac: fix	2020-11-02 19:27:08 +03:00
LdapController.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00
ModulesController.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
PortalController.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
SecurityController.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
SettingsController.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
SmtpSettingsController.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
SsoSettingsV2Controller.cs	Api: added settings controller	2019-08-12 13:53:12 +03:00