Skip to content
This repository has been archived by the owner on Feb 16, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/v2.1.1'
Browse files Browse the repository at this point in the history
* release/v2.1.1:
  Bump version
  Fix yajra/laravel-datatables-fractal and league/fractal compatibility
  • Loading branch information
Omranic committed Jun 2, 2019
2 parents 2e68ae2 + cb1926c commit 9597b46
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](CONTRIBUTING.md).


## [v2.1.1] - 2019-06-02
- Fix yajra/laravel-datatables-fractal and league/fractal compatibility

## [v2.1.0] - 2019-06-02
- Update composer deps
- Drop PHP 7.1 travis test
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -54,7 +54,7 @@
"cortex/foundation": "^2.0.0",
"davejamesmiller/laravel-breadcrumbs": "^5.2.0",
"laravelcollective/html": "~5.8.0",
"league/fractal": "^0.18.0",
"league/fractal": "^0.17.0",
"proengsoft/laravel-jsvalidation": "^2.4.0",
"rinvex/laravel-composer": "^2.0.0",
"rinvex/laravel-statistics": "^2.0.0",
Expand Down

0 comments on commit 9597b46

Please sign in to comment.