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
..
ASC.Web.Api	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.Web.Client	Web: Fixed PWA App icon url on iOS	2020-11-02 21:42:53 +03:00
ASC.Web.Common	Web: Common: fixed update main height timeout	2020-10-30 17:22:49 +03:00
ASC.Web.Components	web: components: bump version	2020-10-30 14:25:33 +03:00
ASC.Web.Core	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00
ASC.Web.Studio	Merge branch 'develop' into refactoring/scope	2020-11-04 15:22:43 +03:00