Stephan e31dd688bf Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent ...

Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj

2013-10-04 14:54:18 +02:00

..

Properties

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

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

RazorCore

Finally got around to changing all calls to umbraco.IO to Umbraco.Core.IO - that'll clear up several hundreds of warnings :)

2013-10-03 12:45:40 +10: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

Scripting

Cleaning up folder structure (U4-56)

2012-06-22 20:39:48 +04:00

packages.config

Updates to latest version of JSON.Net

2013-09-27 13:25:28 +10:00

PluginManagerExtensions.cs

Changed PluginResolverType to PluginManager. Reinstated Resolution and ResolverBase<T> since

2012-08-01 22:06:15 +06:00

umbraco.MacroEngines.csproj

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

2013-10-04 14:54:18 +02:00