mirrors/shlink
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2024-11-26 23:18:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed merge conflicts

Browse source
This commit is contained in:
Alejandro Celaya 2021-11-15 19:55:07 +01:00
commit f2140d1eb0
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
CHANGELOG.md
View file

@ -21,6 +21,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
* *Nothing* * *Nothing*
## [2.9.3] - 2021-11-15
### Added
* *Nothing*
### Changed
* *Nothing*
### Deprecated
* *Nothing*
### Removed
* *Nothing*
### Fixed
* [#1232](https://github.com/shlinkio/shlink/issues/1232) Solved potential SQL injection by enforcing `doctrine/dbal` 3.1.4.
## [2.9.2] - 2021-10-23 ## [2.9.2] - 2021-10-23
### Added ### Added
* *Nothing* * *Nothing*

3
composer.json
View file

@ -18,7 +18,8 @@
"akrabat/ip-address-middleware": "^2.0", "akrabat/ip-address-middleware": "^2.0",
"cakephp/chronos": "^2.2", "cakephp/chronos": "^2.2",
"cocur/slugify": "^4.0", "cocur/slugify": "^4.0",
"doctrine/migrations": "^3.3", "doctrine/dbal": "^3.1.4",
"doctrine/migrations": "^3.3 <3.3.2",
"doctrine/orm": "^2.9", "doctrine/orm": "^2.9",
"endroid/qr-code": "^4.2", "endroid/qr-code": "^4.2",
"geoip2/geoip2": "^2.11", "geoip2/geoip2": "^2.11",