Backport Merge pull request #5620 from tacaswell/fix_quiverkey #5932
Conversation
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
FIX: quiver key pivot location
Member
|
Looks good to me. Do I cherry-pick it to v2.x or what? |
WeatherGod
added a commit
that referenced
this pull request
Jan 28, 2016
Backport Merge pull request #5620 from tacaswell/fix_quiverkey
Member
Author
|
I can handle that but normally we just merge 1.5.1-doc into 1.5.x then merge 1.5.x into 2.x and 2.x into master once in a while. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
FIX: quiver key pivot location
Looks like this slipped through the cracks and wasn't back ported. The test has been accidentally backported to 2.x so 2.x fails. This needs to be merged to 1.5 and then merged into 2.x