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' into 7.1.0

Browse Source 
Conflicts:
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
	src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/Security/MembershipHelper.cs
	src/Umbraco.Web/UmbracoHelper.cs
This commit is contained in:
Shannon
2014-03-11 14:47:00 +11:00
parent 2db1c1bb40 c500d29029
commit 3c771648e3
18 changed files with 647 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -342,6 +342,8 @@
<Compile Include="Models\ImageCropData.cs" />
<Compile Include="Models\IRenderModel.cs" />
<Compile Include="Models\PostRedirectModel.cs" />
<Compile Include="PublishedCache\MemberPublishedContent.cs" />
<Compile Include="PublishedCache\RawValueProperty.cs" />
<Compile Include="PublishedCache\XmlPublishedCache\PublishedFragment.cs" />
<Compile Include="PublishedCache\XmlPublishedCache\PublishedFragmentProperty.cs" />
<Compile Include="Models\RenderModelOfTContent.cs" />