Skip to content

Commit

Permalink
Merge branch 'hotfix/v2.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
silvamfilipe committed Aug 29, 2024
2 parents 9d0d841 + 414c1c2 commit bb3eb25
Show file tree
Hide file tree
Showing 6 changed files with 209 additions and 129 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [v2.2.0] - 2024-08-29
### Fixed
- `slick/webstack` changes the configuration interface to use `ConfigurationInterface`, resulting in
an initialization error.

## [v2.1.3] - 2024-08-13
### Added
- Event handling when (en|dis)abling the module.
Expand Down Expand Up @@ -39,7 +44,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Completely remake for Slick v1.2.0.
- First released stand alone ORM package for Slick framework.

[Unreleased]: https://github.com/slickframework/orm/compare/v2.1.0...HEAD
[Unreleased]: https://github.com/slickframework/orm/compare/v2.2.0...HEAD
[v2.2.0]: https://github.com/slickframework/orm/compare/v2.1.0...v2.2.0
[v2.1.0]: https://github.com/slickframework/orm/compare/v2.0.3...v2.1.0
[v2.0.3]: https://github.com/slickframework/orm/compare/v2.0.2...v2.0.3
[v2.0.2]: https://github.com/slickframework/orm/compare/v2.0.0...v2.0.2
Expand Down
2 changes: 1 addition & 1 deletion LICENSE → LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014-2024 The Slick Team <https://github.com/orgs/slickframework/people>
Copyright (c) 2014-present The Slick Team <https://github.com/orgs/slickframework/people>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Slick ORM is a module that provides ORM support to a Slick application using doctrine/orm.",
"minimum-stability": "dev",
"license": "MIT",
"version": "v2.1.0",
"version": "v2.2.0",
"keywords": [
"slick",
"ORM",
Expand Down Expand Up @@ -47,7 +47,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.1-dev",
"dev-master": "2.2-dev",
"dev-develop": "2.x-dev"
}
},
Expand Down
Loading

0 comments on commit bb3eb25

Please sign in to comment.