Merge branch '7.4.0' into temp-U4-7365

This commit is contained in:
Sebastiaan Janssen
2015-12-16 10:25:19 +01:00
82 changed files with 1924 additions and 4634 deletions

View File

@@ -1403,9 +1403,6 @@
<Name>umbraco.interfaces</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Strings\Notes.txt" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="FileResources\Files.resx">
<Generator>ResXFileCodeGenerator</Generator>