Shannon 6f6c33a721 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 ...

Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Relators/PropertyDataRelator.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Tests/BusinessLogic/BaseTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/TestHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj

2013-10-01 13:38:17 +10:00

..

NuSpecs

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

2013-10-01 13:38:17 +10:00

Build.bat

Bump version number

2013-09-30 10:46:08 +02:00

Build.proj

Fix a strange VS2012 build targets problem

2013-08-20 18:08:34 +02:00

ReplaceIISExpressPortNumber.exe

Match IIS Express port number to Umbraco version so it's easier to use a few copies of the repo locally

2013-06-23 15:13:27 +02:00

RevertToCleanInstall.bat

Add RevertToCleanInstall.bat to 4.11.5 too, it's handy.

2013-02-27 13:51:58 -01:00

RevertToEmptyInstall.bat

Correct path to Courier

2013-04-25 09:02:58 -02:00