yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v8/dev' into vx/feature/unicore

Browse Source 
# Conflicts:
#	src/Umbraco.Abstractions/EnumerableExtensions.cs
#	src/Umbraco.Abstractions/Models/Entities/EntityBase.cs
#	src/Umbraco.Core/Models/Member.cs
This commit is contained in:
Bjarke Berg
2019-07-03 15:00:10 +02:00
parent 83c8d04b15 988d51c4c8
commit 9a2d309dbe
453 changed files with 7849 additions and 4576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/umbraco.sln
View File

@@ -70,7 +70,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E3F9F378
ProjectSection(SolutionItems) = preProject
..\build\NuSpecs\tools\applications.config.install.xdt = ..\build\NuSpecs\tools\applications.config.install.xdt
..\build\NuSpecs\tools\ClientDependency.config.install.xdt = ..\build\NuSpecs\tools\ClientDependency.config.install.xdt
..\build\NuSpecs\tools\install.core.ps1 = ..\build\NuSpecs\tools\install.core.ps1
..\build\NuSpecs\tools\install.ps1 = ..\build\NuSpecs\tools\install.ps1
..\build\NuSpecs\tools\Readme.txt = ..\build\NuSpecs\tools\Readme.txt
..\build\NuSpecs\tools\ReadmeUpgrade.txt = ..\build\NuSpecs\tools\ReadmeUpgrade.txt