Revert blocking and GPL-licensed code#59
Merged
WyriHaximus merged 3 commits intoreactphp:masterfrom Aug 20, 2016
Merged
Conversation
This effectively reverts to 8602944, thus reverting reactphp#13, reactphp#37, reactphp#45 and reactphp#47
This is a sqashed version to add back the changes from reactphp#37: - 2ab98d2 - 75ff84a
Merged
Member
Author
|
Updated to also re-apply (i.e. keep) #58. |
Member
|
LGTM 👍 I'm going to devise a plan for this PR and cuting #41 up in chunks before acting on it |
Member
Author
|
Afaict this is ready for merge and #41 and others likely depend on this, so I'd love to get this in |
Member
|
Done, lets get cracking on splitting up #41 |
Closed
This was referenced Sep 13, 2016
Closed
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
3 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.
This effectively reverts to 8602944 and then re-applies #37 and #58, thus reverting #13, #45 and #47. In other words, once this is in, the master branch will be compatible with the previous v0.4.1 again.
This is necessary because:
Functionally, both #13 and #45 make perfect sense. They will be reworked via #41 by @WyriHaximus in the near future.