pavelbannov 3a747ef8e4 Merge branch 'master' into feature/system-json ... # Conflicts: # common/ASC.Api.Core/Core/ApiContext.cs # common/ASC.Api.Core/Core/ApiDateTime.cs # common/ASC.Api.Core/Model/EmployeeWraper.cs # common/ASC.Api.Core/Model/EmployeeWraperFull.cs # common/ASC.Core.Common/Caching/CachedUserService.cs # common/ASC.Core.Common/Context/Impl/UserManager.cs # products/ASC.People/Server/Models/GroupWrapperFull.cs # products/ASC.People/Server/Startup.cs # web/ASC.Web.Api/Models/BuildVersion.cs		2020-05-07 10:28:20 +03:00
..
ASC.Web.Api	Merge branch 'master' into feature/system-json	2020-05-07 10:28:20 +03:00
ASC.Web.Client	Update yarn.lock files	2020-03-16 10:37:55 +03:00
ASC.Web.Common	web: common: bump version	2020-03-16 10:49:47 +03:00
ASC.Web.Components	web: components: bump version	2020-03-16 10:49:34 +03:00
ASC.Web.Core	Merge branch 'master' into feature/system-json	2020-05-07 10:28:20 +03:00
ASC.Web.Studio	Merge branch 'master' into feature/elastic	2020-02-25 11:24:45 +03:00