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

Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent

Browse Source 
Conflicts:
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Properties/AssemblyInfo.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
This commit is contained in:
Stephan
2013-10-11 10:20:46 +02:00
parent 8a8b09141f 15bbe1b829
commit 69367e0cda
13 changed files with 60 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
View File

@@ -228,7 +228,7 @@ namespace Umbraco.Tests.PublishedContent
}
[PublishedContentModel("ContentType2")]
public class ContentType2 : PublishedContentModel
internal class ContentType2 : PublishedContentModel
{
#region Plumbing
@@ -246,7 +246,7 @@ namespace Umbraco.Tests.PublishedContent
}
[PublishedContentModel("ContentType2Sub")]
public class ContentType2Sub : ContentType2
internal class ContentType2Sub : ContentType2
{
#region Plumbing