Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/trunk' into prerelease
Browse files Browse the repository at this point in the history
  • Loading branch information
tbradsha authored and matticbot committed Nov 18, 2024
1 parent 284c909 commit 5bf2085
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [5.0.1-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [5.0.0] - 2024-11-14
### Removed
- General: Update minimum PHP version to 7.2. [#40147]
Expand Down Expand Up @@ -409,6 +413,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Packages: Introduce a status package

[5.0.1-alpha]: https://github.com/Automattic/jetpack-status/compare/v5.0.0...v5.0.1-alpha
[5.0.0]: https://github.com/Automattic/jetpack-status/compare/v4.0.3...v5.0.0
[4.0.3]: https://github.com/Automattic/jetpack-status/compare/v4.0.2...v4.0.3
[4.0.2]: https://github.com/Automattic/jetpack-status/compare/v4.0.1...v4.0.2
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"require-dev": {
"brain/monkey": "2.6.1",
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-changelogger": "^5.0.0",
"automattic/jetpack-changelogger": "^5.1.0-alpha",
"automattic/jetpack-connection": "@dev",
"automattic/jetpack-plans": "@dev",
"automattic/jetpack-ip": "^0.4.0"
Expand Down
3 changes: 1 addition & 2 deletions src/class-status.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ public function is_offline_mode() {
/**
* Filters Jetpack's offline mode.
*
* @see https://jetpack.com/support/development-mode/
* @todo Update documentation ^^.
* @see https://jetpack.com/support/offline-mode/
*
* @since 1.3.0
*
Expand Down

0 comments on commit 5bf2085

Please sign in to comment.