Shannon 0fc5af5e17 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 ...

Conflicts:
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config

2014-02-20 23:06:13 +11:00

..

Properties

…

RazorCore

Fixes: U4-2967 Inline macros error out when trying to access the Model

2013-12-06 11:22:16 +11:00

RazorDataTypeModels

Replaced all hard-coded GUID references to use the new Constants.

2013-03-14 22:00:37 +00:00

RazorDynamicNode

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

2013-10-03 18:49:58 +02:00

Resources

Fixes: U4-2967 Inline macros error out when trying to access the Model

2013-12-06 11:22:16 +11:00

Scripting

…

packages.config

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

2014-02-20 23:06:13 +11:00

PluginManagerExtensions.cs

…

umbraco.MacroEngines.csproj

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

2014-02-20 23:06:13 +11:00