Fixed more tree merge issues, fixed how property editors are rendered.

2013-06-04 15:59:14 -10:00
parent c932f31f40
commit fea28df758
6 changed files with 146 additions and 69 deletions
--- a/src/Umbraco.Web/UI/JavaScript/RequireJsInitialize.js
+++ b/src/Umbraco.Web/UI/JavaScript/RequireJsInitialize.js
@@ -12,5 +12,6 @@
    'umbraco.controllers',
    'sample.propertyeditor.controller',
    'sampletwo.propertyeditor.controller',
-    'routes'
+    'routes',
+    'namespaceMgr'
 ]