Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpo-33831: Make htmlview run again #7628

Merged
merged 1 commit into from
Jun 11, 2018
Merged

Conversation

andresdelfino
Copy link
Contributor

@andresdelfino andresdelfino commented Jun 11, 2018

@zooba zooba merged commit 0e5f901 into python:master Jun 11, 2018
@miss-islington
Copy link
Contributor

Thanks @andresdelfino for the PR, and @zooba for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@zooba
Copy link
Member

zooba commented Jun 11, 2018

Thanks!

@bedevere-bot
Copy link

GH-7635 is a backport of this pull request to the 3.7 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 11, 2018
(cherry picked from commit 0e5f901)

Co-authored-by: Andrés Delfino <[email protected]>
@miss-islington
Copy link
Contributor

Sorry, @andresdelfino and @zooba, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 0e5f901508dea6437dc9ee89b434feca721d45be 2.7

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 11, 2018
(cherry picked from commit 0e5f901)

Co-authored-by: Andrés Delfino <[email protected]>
@bedevere-bot
Copy link

GH-7636 is a backport of this pull request to the 3.6 branch.

zooba added a commit to zooba/cpython that referenced this pull request Jun 11, 2018
@bedevere-bot
Copy link

GH-7637 is a backport of this pull request to the 2.7 branch.

miss-islington added a commit that referenced this pull request Jun 11, 2018
(cherry picked from commit 0e5f901)

Co-authored-by: Andrés Delfino <[email protected]>
miss-islington added a commit that referenced this pull request Jun 11, 2018
(cherry picked from commit 0e5f901)

Co-authored-by: Andrés Delfino <[email protected]>
@andresdelfino andresdelfino deleted the patch-3 branch June 11, 2018 17:21
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.

5 participants