Skip to content

Conversation

@Bartlomiejsz
Copy link
Contributor

Fixes #6946 and #4737

composer.json Outdated
"monolog/monolog": "1.16.0",
"oyejorge/less.php": "~1.7.0",
"pelago/emogrifier": "0.1.1",
"pelago/emogrifier": "1.1.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't forget to commit changed composer.lock ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you're right, thanks :)

@vrann
Copy link
Contributor

vrann commented Mar 25, 2017

@Bartlomiejsz please update the code with the latest develop branch

@Bartlomiejsz
Copy link
Contributor Author

@vrann, @orlangur I'm closing it, I've created new PR from the develop branch: #9327

@orlangur
Copy link
Contributor

@Bartlomiejsz ok, let's go this way now, but generally it's better to force push into the same branch after you rebased against latest mainline ;)

@Bartlomiejsz
Copy link
Contributor Author

@orlangur ok, next time I will remember :)

@Bartlomiejsz Bartlomiejsz deleted the Emogrifier_Update branch November 14, 2018 19:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants