Merge branch 'master' into textWrap

2016-09-10 01:32:15 +02:00 · 2016-09-10 01:32:15 +02:00 · b730bebcb8
commit b730bebcb8
parent ba6c4c7b78 a07a96f523
1 changed files with 1 additions and 1 deletions
--- a/composer.json
+++ b/composer.json
@ -31,7 +31,7 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "2.6.x-dev"
+            "dev-master": "2.7.x-dev"
        }
    }