Merge branch '2.0' into 2

This commit is contained in:
Damian Mooyman 2017-11-28 10:37:16 +13:00
commit 05e15d85d6
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 1 additions and 1 deletions

View File

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