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

5
src/UmbracoExamine.PDF.Azure/UmbracoExamine.PDF.Azure.csproj
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,8 +41,7 @@
<HintPath>..\packages\AzureDirectory.1.0.5\lib\AzureDirectory.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>
</Reference>
<Reference Include="Examine.Azure">
<SpecificVersion>False</SpecificVersion>