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.0.0

Browse Source 
Conflicts:
	src/Umbraco.Core/ApplicationContext.cs
	src/Umbraco.Core/Models/ContentBase.cs
	src/Umbraco.Core/Models/ContentTypeBase.cs
	src/Umbraco.Core/Models/DataTypeDefinition.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Core/Services/IMemberTypeService.cs
	src/Umbraco.Core/Services/MemberTypeService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Tests/Routing/uQueryGetNodeIdByUrlTests.cs
This commit is contained in:
Shannon
2013-10-09 13:41:14 +11:00
parent 3c38b335a6 09b7186713
commit f8d6c85779
23 changed files with 552 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
View File

@@ -21,7 +21,6 @@ using Umbraco.Core.Persistence.UnitOfWork;
using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Publishing;
using Umbraco.Core.Services;
using Umbraco.Tests.Stubs;
using Umbraco.Web;
using Umbraco.Web.PublishedCache;
using Umbraco.Web.PublishedCache.XmlPublishedCache;