Conversation
Prepares for release 5.1.2
Prepares v6.0.0 release
Prepares for bug fix release 6.0.1
Ensure icons are added to assets
enable to run vector format(GeoJSON)
|
You are seeing this message because GitHub Code Scanning has recently been set up for this repository, or this pull request contains the workflow file for the Code Scanning tool. What Enabling Code Scanning Means:
For more information about GitHub Code Scanning, check out the documentation. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
nexthas drifted frommain: it is behindmainby 9 commits (and ahead by 3). As a resultnextis missing changes that already landed onmain, notably:enable to run vector format (GeoJSON)rendering (enable to run vector format(GeoJSON) #354)Ensure all assets are handled by webpackinit.rb/package.jsonThis PR brings
mainintonextsonext⊇mainagain.What
Merges
mainintonext. The merge is conflict-free (git merge-treereports no conflicts; 12 files auto-merge).nextkeeps its own 3 commits (the<hr>→<br>settings layout tweak and the test-assertion-warning fix).