Skip to content

Commit 8ca9caa

Browse files
westonruterwestonruter
authored
Merge branch 'develop' into dependabot/github_actions/actions/cache-4.0.1
2 parents 63adf79 + ecb3124 commit 8ca9caa

File tree

12 files changed

+2171
-2080
lines changed

12 files changed

+2171
-2080
lines changed

Diff for: ‎.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18
1+
20

Diff for: ‎assets/src/components/clipboard-button/test/__snapshots__/index.js.snap

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎assets/src/components/error-screen/test/__snapshots__/index.js.snap

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎assets/src/components/template-mode-option/test/__snapshots__/index.js.snap

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎assets/src/onboarding-wizard/components/nav/test/__snapshots__/index.js.snap

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎includes/embeds/class-amp-tiktok-embed-handler.php

+2
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ protected function make_embed_amp_compatible( Element $blockquote ) {
9393

9494
$blockquote->parentNode->replaceChild( $amp_tiktok, $blockquote );
9595
$amp_tiktok->appendChild( $blockquote );
96+
97+
/** @var DOMDocument $dom */
9698
$blockquote->setAttributeNode( $dom->createAttribute( Attribute::PLACEHOLDER ) );
9799
$blockquote->removeAttribute( Attribute::STYLE );
98100
}

0 commit comments

Comments
 (0)