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

📖 Sync recent changes from amphtml to amp.dev #5843

Merged
merged 1 commit into from
May 17, 2021
Merged

📖 Sync recent changes from amphtml to amp.dev #5843

merged 1 commit into from
May 17, 2021

Conversation

rsimha
Copy link
Collaborator

@rsimha rsimha commented May 13, 2021

This PR is a supplement to recent and upcoming changes in the amphtml repo. It syncs the following changes to amp.dev:

This PR will need to merged at the same time as ampproject/amphtml#34047 and ampproject/amphtml#34160. I will coordinate this with @sebastianbenz or @patrickkettner.

/cc @ampproject/wg-outreach

Partial fix for ampproject/amphtml#33964

@rsimha
Copy link
Collaborator Author

rsimha commented May 13, 2021

Update: ampproject/amphtml#34047 and ampproject/amphtml#34160 have been fully tested and reviewed, and are now ready to merge along with this PR.

Copy link
Collaborator

@sebastianbenz sebastianbenz left a comment

Choose a reason for hiding this comment

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

Thanks!

@sebastianbenz
Copy link
Collaborator

Let me know when I should merge.

@rsimha
Copy link
Collaborator Author

rsimha commented May 17, 2021

@sebastianbenz Both amphtml PRs have landed. Merging this now. Let me know what needs to be done to confirm that the changes worked.

@rsimha rsimha changed the title Sync recent changes from amphtml to amp.dev 📖 Sync recent changes from amphtml to amp.dev May 17, 2021
@rsimha rsimha merged commit bf4473a into ampproject:future May 17, 2021
@rsimha rsimha deleted the 2021-05-13-UpdateAmphtmlDocs branch May 17, 2021 14:04
@sebastianbenz
Copy link
Collaborator

Just verified locally, all document imports work.

@sebastianbenz
Copy link
Collaborator

Thanks @rsimha!

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.

2 participants