Merge branch 'MAGETWO-36471' of github.corp.ebay.com:magento-troll/magento2ce into kpi

slopukhov · slopukhov · commit c684b5217118 · 2015-05-06T13:17:48.000+03:00
diff --git a/app/code/Magento/Theme/view/adminhtml/requirejs-config.js b/app/code/Magento/Theme/view/adminhtml/requirejs-config.js
@@ -5,6 +5,9 @@
 
 var config = {
     "shim": {
+        "extjs/ext-tree": [
+            "prototype"
+        ],
         "extjs/ext-tree-checkbox": [
             "extjs/ext-tree",
             "extjs/defaults"
