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

Conflicts: src/Umbraco.Tests/MockTests.cs src/Umbraco.Web/UmbracoContext.cs
2014-03-03 04:17:40 +01:00
parent 3fc96a45a6 feb9f40237
commit 57c9d9ca7b
3 changed files with 82 additions and 33 deletions
--- a/src/Umbraco.Tests/MockTests.cs
+++ b/src/Umbraco.Tests/MockTests.cs
@@ -116,7 +116,6 @@ namespace Umbraco.Tests
            Assert.AreNotEqual(appCtx, result);
        }

-        [NUnit.Framework.Ignore("Need to fix more stuff up, this is ignore because an exception occurs because it wants to ensure we have a resolver initialized - need to make that process better for testability")]
        [Test]
        public void Can_Get_Umbraco_Context()
        {