Merge pull request #693 from spryker/bugfix/core-2155-statemachine-su…

…bprocess-reuse Update spryker core.
spryker · Oct 20, 2017 · 6cd60c9 · 6cd60c9
2 parents f215991 + 46a5dfa
commit 6cd60c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "description": "Project",
   "license": "MIT",
   "require": {
-    "spryker/spryker": "dev-bugfix/core-2155-statemachine-subprocess-reuse",
+    "spryker/spryker": "dev-master",
 
     "php": ">=5.6.0",
     "braintree/braintree_php": "~3.15.0",

diff --git a/composer.lock b/composer.lock