Merge branch '2'

This commit is contained in:
Robbie Averill 2017-12-20 16:42:44 +13:00
commit c83a7c3403

View File

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