Merge remote-tracking branch 'refs/remotes/filp/master'

This commit is contained in:
Mackenzie
2018-03-03 15:50:34 -06:00
+1 -1
View File
@@ -36,7 +36,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
"dev-master": "2.1-dev"
}
}
}