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

Merge branch '7.0.0' into 7.0.0-pubcontent

Browse Source 
Conflicts:
	src/Umbraco.Core/PublishedContentHelper.cs
This commit is contained in:
Stephan
2013-09-27 15:59:42 +02:00
parent ce15d46a5e f456e5b83e
commit a8a2c706ba
87 changed files with 1299 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -437,6 +437,8 @@
<Compile Include="Persistence\Relators\MacroPropertyRelator.cs" />
<Compile Include="Persistence\Repositories\Interfaces\IMacroRepository.cs" />
<Compile Include="Persistence\Repositories\MacroRepository.cs" />
<Compile Include="PropertyEditors\BackwardsCompatibleData.cs" />
<Compile Include="PropertyEditors\BackwardsCompatibleDataType.cs" />
<Compile Include="PropertyEditors\LegacyParameterEditorAliasConverter.cs" />
<Compile Include="PropertyEditors\LegacyPropertyEditorIdToAliasConverter.cs" />
<Compile Include="Persistence\Mappers\MapperForAttribute.cs" />