DocSpace-client/web
pavelbannov 475269ee84 Merge branch 'feature/backend-refactor' into feature/people-refactor
# Conflicts:
#	products/ASC.Files/Core/Model/FileEntryWrapper.cs
#	products/ASC.Files/Core/Model/FileShareWrapper.cs
#	products/ASC.Files/Core/Model/FileWrapper.cs
#	products/ASC.Files/Core/Model/FolderWrapper.cs
#	products/ASC.People/Server/GlobalUsings.cs
2022-03-05 11:27:58 +03:00
..
ASC.Web.Api Merge branch 'feature/backend-refactor' into feature/people-refactor 2022-03-05 11:27:58 +03:00
ASC.Web.Campaigns Web: Campaigns: add ads examples 2022-02-16 14:11:49 +03:00
ASC.Web.Client Merge branch 'master' into develop 2022-02-21 22:22:38 +03:00
ASC.Web.Core Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00
ASC.Web.Editor Merge branch 'master' into develop 2022-02-21 22:22:38 +03:00
ASC.Web.HealthChecks.UI Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00
ASC.Web.Login Merge branch 'master' into develop 2022-02-21 22:22:38 +03:00
ASC.Web.Studio Csproj: ImplicitUsings 2022-03-05 11:20:05 +03:00