pavelbannov c171e2c903 Merge branch 'master' into refactoring/di ... # Conflicts: # common/ASC.Api.Core/ASC.Api.Core.csproj # common/ASC.Common/ASC.Common.csproj # common/ASC.Core.Common/ASC.Core.Common.csproj # common/ASC.Data.Storage/ASC.Data.Storage.csproj # common/ASC.FederatedLogin/ASC.FederatedLogin.csproj # common/ASC.IPSecurity/ASC.IPSecurity.csproj # common/ASC.Resource.Manager/ASC.Resource.Manager.csproj # common/ASC.VoipService/ASC.VoipService.csproj # web/ASC.Web.Api/ASC.Web.Api.csproj # web/ASC.Web.Core/ASC.Web.Core.csproj # web/ASC.Web.Studio/ASC.Web.Studio.csproj		2019-09-18 13:32:39 +03:00
..
ASC.Web.Api	Merge branch 'master' into refactoring/di	2019-09-18 13:32:39 +03:00
ASC.Web.Client	Web: update yarn lock files	2019-09-18 11:30:38 +03:00
ASC.Web.Components	web: components: bump version	2019-09-18 11:20:23 +03:00
ASC.Web.Core	Merge branch 'master' into refactoring/di	2019-09-18 13:32:39 +03:00
ASC.Web.Studio	.net core up to 3.0.0-rc1	2019-09-18 12:29:17 +03:00