Merge remote-tracking branch 'remotes/dev/1.8' into 1.8

oroinc · Aug 31, 2015 · 31dcb84 · 31dcb84
2 parents 002ee9b + 3507a93
commit 31dcb84
Show file tree

Hide file tree

Showing 2 changed files with 375 additions and 50 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "oro/platform": "1.x-dev"
+        "oro/platform": "1.8.*"
     },
     "config": {
         "component-dir": "web/bundles/components"