Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/trunk' into update/videopress-up…
Browse files Browse the repository at this point in the history
…date-thumb-placeholder-while-updating
  • Loading branch information
dhasilva committed Oct 7, 2024
2 parents 794d324 + ce31d5d commit 9b4eb75
Show file tree
Hide file tree
Showing 96 changed files with 967 additions and 796 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Bug Report
description: Report issues with one of our products.
labels: [ 'Needs triage', '[Type] Bug' ]
type: 'Bug'
body:
- type: markdown
attributes:
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Enhancement Request
description: Suggest a change to a feature you like!
title: "Enhancement:"
labels: ["[Type] Enhancement"]
type: 'Enhancement'
body:
- type: dropdown
id: plugin-type
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Feature Request
description: Suggest an idea for this project!
title: "Feature Request:"
labels: ["[Type] Feature Request"]
type: 'Enhancement'
body:
- type: dropdown
id: plugin-type
Expand Down
Binary file modified .github/files/e2e-tests/notification-rules.enc
Binary file not shown.
2 changes: 1 addition & 1 deletion .phan/stubs/amp-stubs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Stubs automatically generated from AMP 2.5.4 and AMP for WP 1.0.98
* Stubs automatically generated from AMP 2.5.4 and AMP for WP 1.0.99.1
* using the definition file `tools/stubs/amp-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
Expand Down
2 changes: 1 addition & 1 deletion .phan/stubs/woocommerce-internal-stubs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Stubs automatically generated from WooCommerce 9.3.2
* Stubs automatically generated from WooCommerce 9.5.0-dev
* using the definition file `tools/stubs/woocommerce-internal-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
Expand Down
2 changes: 1 addition & 1 deletion .phan/stubs/woocommerce-payments-stubs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Stubs automatically generated from WooPayments 8.2.1
* Stubs automatically generated from WooPayments 8.2.2
* using the definition file `tools/stubs/woocommerce-payments-stub-defs.php` in the Jetpack monorepo.
*
* Do not edit this directly! Run tools/stubs/update-stubs.sh to regenerate it.
Expand Down
Loading

0 comments on commit 9b4eb75

Please sign in to comment.