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.

Sign up for GitHub

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

Jump to bottom

rephrased reasoning for text node #26393

Merged
merged 2 commits into from
Jan 18, 2020
Merged

rephrased reasoning for text node #26393

merged 2 commits into from
Jan 18, 2020

Conversation

CrystalOnScript
Copy link
Contributor

No description provided.

@CrystalOnScript CrystalOnScript merged commit b0e732a into ampproject:master Jan 18, 2020
@CrystalOnScript CrystalOnScript deleted the timeago-again branch January 18, 2020 00:38
robinvanopstal added a commit to jungvonmatt/amphtml that referenced this pull request Jan 20, 2020
@robinvanopstal
Merge branch 'master' into component-intro-tables
fd92c68 
* master:
  [yahoonativeads-amp] code cleanup and bug fix (ampproject#26325)
  rephrased reasoning for text node  (ampproject#26393)
  Render video alt and title attributes in vertical rendering mdoe. (ampproject#26370)
  Revert "Update I2I & I2S to reflect new Open Source process (ampproject#25530)" (ampproject#26392)
  Skip amp story affiliate link test (ampproject#26386)
  Update I2I & I2S to reflect new Open Source process (ampproject#25530)
  ✨ Add support for `"intrisic"` layout for `<amp-script>` (ampproject#26369)
  📖 Rename Dev Channel to Experimental Channel in docs and comments (ampproject#26255)
  ✨Add support for AMP Story Quiz Reaction API calls (ampproject#26242)
  clarified text node behavior (ampproject#26376)

# Conflicts:
#	extensions/amp-script/amp-script.md
#	extensions/amp-timeago/amp-timeago.md
@CrystalOnScript CrystalOnScript restored the timeago-again branch February 7, 2020 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kristoferbaxter kristoferbaxter kristoferbaxter approved these changes

@jridgewell jridgewell jridgewell approved these changes

@alanorozco alanorozco Awaiting requested review from alanorozco

@zhangsu zhangsu Awaiting requested review from zhangsu

Assignees
No one assigned
Labels
cla: yes PR use: In Beta / Experimental
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@CrystalOnScript @kristoferbaxter @jridgewell @googlebot @ampprojectbot