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

Merge remote-tracking branch 'origin/dev-v7.6' into temp-U4-1324

Browse Source 
Conflicts:
	src/Umbraco.Core/packages.config
	src/Umbraco.Tests/packages.config
This commit is contained in:
Claus
2017-02-08 09:14:27 +01:00
parent 7be30ad6ac 0f930d7342
commit 24063c403a
90 changed files with 1382 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/web.Template.Debug.config
View File

@@ -382,7 +382,7 @@
xdt:Locator="Condition(_defaultNamespace:assemblyIdentity[@name='Newtonsoft.Json']])"/>
<dependentAssembly xdt:Transform="Insert">
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly xdt:Transform="Remove"