Merge branch '2'

This commit is contained in:
Damian Mooyman 2017-11-28 10:50:26 +13:00
commit 36341b24bb
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A

View File

@ -22,7 +22,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.1.x-dev" "2.x-dev": "2.2.x-dev"
} }
}, },
"autoload": { "autoload": {