Files
Umbraco-CMS/src/Umbraco.Core/Services
Shannon 2a1e3dc2f8 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
2013-10-02 09:22:33 +10:00
..
2013-05-29 13:18:40 -02:00