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
..
Properties	fix	2020-08-21 17:33:58 +03:00
appsettings.json	socket.io: first version	2020-08-02 23:12:45 +03:00
ASC.Socket.IO.Svc.csproj	WebSocketSharp to nuget	2020-08-20 12:38:57 +03:00
Program.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
SocketServiceLauncher.cs	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
SocketSettings.cs	socket.io: first version	2020-08-02 23:12:45 +03:00