Merge remote-tracking branch 'origin/4.2' into 4
This commit is contained in:
commit
f5b659cb4f
|
@ -21,7 +21,7 @@
|
|||
"favicon.ico"
|
||||
],
|
||||
"branch-alias": {
|
||||
"4.x-dev": "4.2.x-dev"
|
||||
"4.x-dev": "4.3.x-dev"
|
||||
}
|
||||
},
|
||||
"config": {
|
||||
|
|
Loading…
Reference in New Issue