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

add prerender complete message #2682

Merged
merged 1 commit into from Mar 24, 2016

Conversation

erwinmombay
Copy link
Member

Closes #2400

@erwinmombay erwinmombay force-pushed the add-prerendercomplete branch 3 times, most recently from 7581606 to 8289ffc Compare March 24, 2016 09:00
@@ -74,7 +74,6 @@ describe('example', function() {
// TODO(dvoytenko, #2600): remove this from whitelist once the message
// contains more specific script identifier.
/The tag \'script\' is disallowed/,
/\'amp-brid-player\' is disallowed/,
Copy link
Contributor

Choose a reason for hiding this comment

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

Merge conflict?

Copy link
Member Author

Choose a reason for hiding this comment

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

yeppp. thanks

@jridgewell
Copy link
Contributor

LGTM.

@erwinmombay
Copy link
Member Author

/cc @alf7

@erwinmombay erwinmombay merged commit adc2993 into ampproject:master Mar 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants