Skip to content

/ servo

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

Sync WPT with upstream (24-09-2018) #21806

Closed
wants to merge 1 commit into from
Closed

Sync WPT with upstream (24-09-2018) #21806

wants to merge 1 commit into from

Conversation

@servo-wpt-sync
Copy link
Collaborator

servo-wpt-sync commented Sep 25, 2018 •
edited by SimonSapin

Automated downstream sync of changes from upstream as of 24-09-2018.
[no-wpt-sync]

This change is Reviewable
@servo-wpt-sync
Update web-platform-tests to revision b040cb2a07264d35b9f47cd9deb2fb2…
Loading status checks…
f087c46 
…889fca6d4
@highfive
Copy link

highfive commented Sep 25, 2018

Heads up! This PR modifies the following files:

  • @jgraham: tests/wpt/webgl/meta/conformance/textures/misc/texture-upload-size.html.ini
@jdm
Copy link
Member

jdm commented Sep 25, 2018

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Sep 25, 2018

📌 Commit f087c46 has been approved by jdm
@highfive highfive assigned jdm and unassigned ferjm Sep 25, 2018
@bors-servo
Copy link
Contributor

bors-servo commented Sep 25, 2018

☔ The latest upstream changes (presumably #21506) made this pull request unmergeable. Please resolve the merge conflicts.
@bors-servo
Copy link
Contributor

bors-servo commented Sep 25, 2018

🔒 Merge conflict
@jdm jdm closed this Sep 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
S-needs-rebase
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@servo-wpt-sync @highfive @jdm @bors-servo @ferjm
You can’t perform that action at this time.