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

Merge remote-tracking branch 'origin/6.2.1' into 7.1.5

Browse Source 
Conflicts:
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
This commit is contained in:
Shannon
2014-06-17 16:09:29 +10:00
parent 1f161b2b9c d3bb750f98
commit 1c23940b0b
16 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -124,8 +124,8 @@
<HintPath>..\packages\ClientDependency-Mvc.1.7.0.4\lib\ClientDependency.Core.Mvc.dll</HintPath>
</Reference>
<Reference Include="Examine">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Examine.0.1.55.2941\lib\Examine.dll</HintPath>
<HintPath>..\packages\Examine.0.1.56.2941\lib\Examine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ImageProcessor, Version=1.8.8.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>