Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.3.1 additional cherry-picks #10790

Merged
merged 3 commits into from
Jun 21, 2021
Merged

Conversation

rreusser
Copy link
Contributor

@rreusser rreusser commented Jun 21, 2021

Cherry-picks #10709 and https://github.com/mapbox/mapbox-gl-js/pull/10719/files for v2.3.1

data/array_types.js had a very, very slightly nontrivial merge in the exported struct names, but I think it should be fine. Just something to watch for. 👀

Edit: TIL about array_types.js being auto-generated. Seems I got the manual merge correct at any rate, so it's all good

cc @arindam1993 @karimnaaji

@rreusser rreusser merged commit c377a90 into release-v2.3.0 Jun 21, 2021
@rreusser rreusser deleted the ricky/additional-2.3.1-cp branch June 21, 2021 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants