Merge 1.x into Master #109
Merged
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
* Revert "make command lazy (FriendsOfSymfony#96)" This reverts commit e9cf107. * Revert "Replace the Ivory bundle (FriendsOfSymfony#98)" This reverts commit 79986c3.
* deprecation notice * Make deprecation nicer.
* fix tests * fix travis
Fixed a typo in the composer's comand from `friensofsymfony` to `friendsofsymfony`
kunicmarko20
force-pushed
the
master_stable
branch
from
c98ab7f to
fd34d04
Compare
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.
Merge 1.x into master so I can continue with rest of the issues on master branch.