Files
Umbraco-CMS/src/Umbraco.Web.UI
Shannon c0380e491b Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs
	src/umbraco.controls/TreePicker/SimpleContentPicker.cs
2013-12-19 11:41:03 +11:00
..
2013-11-07 17:16:22 +01:00
2013-11-07 17:16:22 +01:00
2013-12-11 18:53:00 +11:00
2013-12-16 13:23:07 +11:00