Skip to content

Commit

Permalink
Merge pull request #2391 from woocommerce/trunk
Browse files Browse the repository at this point in the history
Release 2.6.9 - Merge `trunk` to `develop`
  • Loading branch information
ianlin authored May 7, 2024
2 parents ad637eb + 9dfd3f4 commit 96dba1c
Show file tree
Hide file tree
Showing 6 changed files with 241 additions and 239 deletions.
3 changes: 3 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
*** WooCommerce Google Listings and Ads Changelog ***

= 2.6.9 - 2024-05-07 =
* Tweak - Confirm issues are present when retrieving product status.

= 2.6.8 - 2024-04-23 =
* Tweak - Remove deprecated event properties marked as removable after Q1 2024 from the onboarding event tracking.
* Tweak - Update tags in readme.txt.
Expand Down
4 changes: 2 additions & 2 deletions google-listings-and-ads.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Google Listings and Ads
* Plugin URL: https://wordpress.org/plugins/google-listings-and-ads/
* Description: Native integration with Google that allows merchants to easily display their products across Google’s network.
* Version: 2.6.8
* Version: 2.6.9
* Author: WooCommerce
* Author URI: https://woo.com/
* Text Domain: google-listings-and-ads
Expand All @@ -30,7 +30,7 @@

defined( 'ABSPATH' ) || exit;

define( 'WC_GLA_VERSION', '2.6.8' ); // WRCS: DEFINED_VERSION.
define( 'WC_GLA_VERSION', '2.6.9' ); // WRCS: DEFINED_VERSION.
define( 'WC_GLA_MIN_PHP_VER', '7.4' );
define( 'WC_GLA_MIN_WC_VER', '6.9' );

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "google-listings-and-ads",
"title": "Google Listings and Ads",
"version": "2.6.8",
"version": "2.6.9",
"description": "google-listings-and-ads",
"author": "Automattic",
"license": "GPL-3.0-or-later",
Expand Down
9 changes: 4 additions & 5 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Requires at least: 5.9
Tested up to: 6.5
Requires PHP: 7.4
Requires PHP Architecture: 64 Bits
Stable tag: 2.6.8
Stable tag: 2.6.9
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -111,6 +111,9 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis

== Changelog ==

= 2.6.9 - 2024-05-07 =
* Tweak - Confirm issues are present when retrieving product status.

= 2.6.8 - 2024-04-23 =
* Tweak - Remove deprecated event properties marked as removable after Q1 2024 from the onboarding event tracking.
* Tweak - Update tags in readme.txt.
Expand All @@ -121,8 +124,4 @@ Yes, you can run both at the same time, and we recommend it! In the US, advertis
* Dev - Update e2e test environment to install WooCommerce earlier.
* Fix - Exception in request review.

= 2.6.6 - 2024-04-09 =
* Dev - Add snippet to bypass WooCommerce dependency in E2E tests.
* Tweak - WC 8.8 compatibility.

[See changelog for all versions](https://raw.githubusercontent.com/woocommerce/google-listings-and-ads/trunk/changelog.txt).
Loading

0 comments on commit 96dba1c

Please sign in to comment.