Files
Umbraco-CMS/src
Shannon e75c050eff Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias
Conflicts:
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
2013-09-11 13:07:22 +10:00
..
2013-09-02 15:40:14 +02:00