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
..
Actions.cs	moved from release/11 4414f77b	2020-09-18 17:45:59 +03:00
NotifyConfiguration.cs	Autofac: fix	2020-11-02 19:27:08 +03:00
SpamEmailSettings.cs	api-defaultvalue: fix	2020-07-02 23:51:18 +03:00
StudioNotifyHelper.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
StudioNotifyService.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
StudioNotifyServiceHelper.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
StudioNotifyServiceSender.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
StudioNotifySource.cs	Scope: refactoring	2020-10-19 18:53:15 +03:00
StudioPeriodicNotify.cs	Scope: refactoring.	2020-10-28 15:26:27 +03:00
StudioSubscriptionManager.cs	fix	2020-08-27 17:01:37 +03:00
StudioWhatsNewNotify.cs	Scope: refactoring.	2020-10-28 15:26:27 +03:00
Tags.cs	moved from release/11 4414f77b	2020-09-18 17:45:59 +03:00
TagValues.cs	fix	2020-08-27 17:01:37 +03:00