Merge remote-tracking branch 'origin/4.2' into 4

This commit is contained in:
Damian Mooyman 2018-06-15 16:06:14 +12:00
commit f5b659cb4f
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A

View File

@ -21,7 +21,7 @@
"favicon.ico" "favicon.ico"
], ],
"branch-alias": { "branch-alias": {
"4.x-dev": "4.2.x-dev" "4.x-dev": "4.3.x-dev"
} }
}, },
"config": { "config": {