update composer file, introducing 2.1 version

2014-08-11 17:05:23 +02:00
parent 4800a1e801
commit 9a43f5aa3c
2 changed files with 3 additions and 2 deletions
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "2.0.0-dev"
+            "dev-master": "2.1.0-dev"
        }
    },
    "repositories": [
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "hash": "4606e1d72b13b6b8fa84dca5f7bac16b",
+    "hash": "491658296d844863c480ef8411f8efa3",
    "packages": [
        {
            "name": "doctrine/cache",
@@ -2734,6 +2734,7 @@
        "fzaninotto/faker": 20,
        "maximebf/debugbar": 20
    },
+    "prefer-stable": false,
    "platform": {
        "php": ">=5.4"
    },