Shannon 1c23940b0b Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 ...

Conflicts:
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config

2014-06-17 16:09:29 +10:00

..

Properties

Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies

2012-11-26 07:46:29 -01:00

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

Fixes U4-4650 Pluralization of document type aliases doesn't always work

2014-05-16 14:23:40 +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

…

app.config

downgrades mini profiler to what it used to be

2014-06-09 15:32:44 +02:00

packages.config

Merge remote-tracking branch 'origin/6.2.1' into 7.1.5

2014-06-17 16:09:29 +10:00

PluginManagerExtensions.cs

…

umbraco.MacroEngines.csproj

Merge remote-tracking branch 'origin/6.2.1' into 7.1.5

2014-06-17 16:09:29 +10:00