Skip to content

Commit

Permalink
Merge branch 'develop' into trunk
Browse files Browse the repository at this point in the history
  • Loading branch information
dkotter committed Nov 16, 2023
2 parents 4a327be + ee00699 commit 77a8d63
Show file tree
Hide file tree
Showing 7 changed files with 200 additions and 87 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file, per [the Ke

## [Unreleased] - TBD

## [1.5.2] - 2023-11-16

### Changed

- Bump WordPress "tested up to" version to 6.4 (props [@qasumitbagthariya](https://github.com/qasumitbagthariya), [@jeffpaul](https://github.com/jeffpaul) via [#28](https://github.com/10up/block-catalog/pull/28), [#29](https://github.com/10up/block-catalog/pull/29)).

## [1.5.1] - 2023-10-24

**Note that this release changes the name of the base plugin file. As such, you'll probably need to reactivate the plugin after updating.**
Expand Down Expand Up @@ -79,6 +85,7 @@ All notable changes to this project will be documented in this file, per [the Ke
- Initial release

[Unreleased]: https://github.com/10up/block-catalog/compare/trunk...develop
[1.5.2]: https://github.com/10up/block-catalog/compare/1.5.1...1.5.2
[1.5.1]: https://github.com/10up/block-catalog/compare/1.5.0...1.5.1
[1.5.0]: https://github.com/10up/block-catalog/compare/1.4.0...1.5.0
[1.4.0]: https://github.com/10up/block-catalog/compare/1.3.2...1.4.0
Expand Down
2 changes: 1 addition & 1 deletion CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The following individuals are responsible for curating the list of issues, respo

Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.

[Darshan Sawardekar (@dsawardekar)](https://github.com/dsawardekar), [Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Brooke Campbell](https://www.linkedin.com/in/brookecampbelldesign/), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Depandabot (@dependabot)](https://github.com/apps/dependabot).
[Darshan Sawardekar (@dsawardekar)](https://github.com/dsawardekar), [Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Darin Kotter (@dkotter)](https://github.com/dkotter), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Brooke Campbell](https://www.linkedin.com/in/brookecampbelldesign/), [Faisal Alvi (@faisal-alvi)](https://github.com/faisal-alvi), [Peter Wilson (@peterwilsoncc)](https://github.com/peterwilsoncc), [Depandabot (@dependabot)](https://github.com/apps/dependabot), [Sumit Bagthariya (@qasumitbagthariya)](https://github.com/qasumitbagthariya).

## Libraries

Expand Down
4 changes: 2 additions & 2 deletions block-catalog.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Plugin Name: Block Catalog
* Description: Easily keep track of which Gutenberg Blocks are used across your site.
* Version: 1.5.1
* Version: 1.5.2
* Requires at least: 5.7
* Requires PHP: 7.4
* Author: Darshan Sawardekar, 10up
Expand All @@ -16,7 +16,7 @@
*/

// Useful global constants.
define( 'BLOCK_CATALOG_PLUGIN_VERSION', '1.5.1' );
define( 'BLOCK_CATALOG_PLUGIN_VERSION', '1.5.2' );
define( 'BLOCK_CATALOG_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
define( 'BLOCK_CATALOG_PLUGIN_PATH', plugin_dir_path( __FILE__ ) );
define( 'BLOCK_CATALOG_PLUGIN_INC', BLOCK_CATALOG_PLUGIN_PATH . 'includes/' );
Expand Down
Loading

0 comments on commit 77a8d63

Please sign in to comment.