Merge v2.5.1 into v3.0.0#2213
Merged
nventuro merged 5 commits intoOpenZeppelin:masterfrom Apr 27, 2020
Merged
Conversation
* Restore _approve check for zero sender * Add non-zero operator check to _send
frangio
approved these changes
Apr 24, 2020
Contributor
frangio
left a comment
frangio
left a comment
There was a problem hiding this comment.
Should this be squashed or merged?
Contributor
Author
|
Hm. I don't think there's much of a difference, though I wonder if squashing would make merging a future v2.5.2 harder. I'd think not, but don't really know. |
Contributor
|
Our release guide says not to squash these kinds of merges. |
Contributor
Author
|
Merge it is! |
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
2 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.
Continuation of #2212
Fixes #2208
This ports the bugfix on the v2.5 branch into the v3.0 branch. Once this is merged, this will be the new v3.0.1 release.