Merge branch 'master' into 0.1

olix21 · Aug 12, 2017 · 191e736 · 191e736
2 parents 2f71534 + 57c3ffc
commit 191e736
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -14,12 +14,17 @@
   ],
   "require": {
     "php": ">=7.1.0",
-    "dywee/core-bundle": "0.1",
+    "dywee/core-bundle": "0.1-dev",
     "payum/payum-bundle": "^2.2"
   },
   "autoload": {
     "psr-4": {
       "Dywee\\OrderBundle\\": ""
     }
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "0.1-dev"
+    }
   }
 }