Files
Umbraco-CMS/src/Umbraco.Core
Shannon f7e7687f27 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/TypeFinder.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
2013-08-29 15:18:19 +10:00
..
2013-05-07 12:35:13 -02:00
2013-06-20 15:49:55 +10:00
2013-08-09 11:37:57 +10:00
2013-05-17 05:51:49 -02:00
2013-05-06 15:20:26 -10:00