Skip to content

Commit

Permalink
Merge branch 'main' into craft-5
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
#	composer.lock
#	src/PaginatorAdapter.php
  • Loading branch information
brandonkelly committed Mar 11, 2024
2 parents 545534d + 440a9ba commit e8d0a9e
Show file tree
Hide file tree
Showing 2 changed files with 207 additions and 123 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release Notes for Element API

## Unreleased

- Updated Fractal to 0.20. ([#183](https://github.com/craftcms/element-api/pull/183))

## 3.0.1.1 - 2022-07-07

### Fixed
Expand Down
Loading

0 comments on commit e8d0a9e

Please sign in to comment.