Merge branch '2.0' into 2
This commit is contained in:
commit
05e15d85d6
|
@ -23,7 +23,7 @@
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-master": "2.0.x-dev"
|
"2.x-dev": "2.1.x-dev"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
|
Loading…
Reference in New Issue