Merge branch '1.8.x' into 1.x

This commit is contained in:
Sebastien Ros
2014-05-16 18:02:06 -07:00

View File

@@ -87,10 +87,6 @@
<Project>{9916839C-39FC-4CEB-A5AF-89CA7E87119F}</Project>
<Name>Orchard.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Orchard.Media\Orchard.Media.csproj">
<Project>{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}</Project>
<Name>Orchard.Media</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Placement.info">