mirror of
https://github.com/shlinkio/shlink.git
synced 2024-12-23 07:33:58 -06:00
Fix merge conflicts
This commit is contained in:
commit
99010b6eae
17
CHANGELOG.md
17
CHANGELOG.md
@ -8,6 +8,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
|
|||||||
### Added
|
### Added
|
||||||
* [#2018](https://github.com/shlinkio/shlink/issues/2018) Add option to allow all short URLs to be unconditionally crawlable in robots.txt, via `ROBOTS_ALLOW_ALL_SHORT_URLS=true` env var, or config options.
|
* [#2018](https://github.com/shlinkio/shlink/issues/2018) Add option to allow all short URLs to be unconditionally crawlable in robots.txt, via `ROBOTS_ALLOW_ALL_SHORT_URLS=true` env var, or config options.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
* *Nothing*
|
||||||
|
|
||||||
|
### Deprecated
|
||||||
|
* *Nothing*
|
||||||
|
|
||||||
|
### Removed
|
||||||
|
* *Nothing*
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
* *Nothing*
|
||||||
|
|
||||||
|
|
||||||
|
## [4.1.1] - 2024-05-23
|
||||||
|
### Added
|
||||||
|
* *Nothing*
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
* Use new reusable workflow to publish docker image
|
* Use new reusable workflow to publish docker image
|
||||||
* [#2015](https://github.com/shlinkio/shlink/issues/2015) Update to PHPUnit 11.
|
* [#2015](https://github.com/shlinkio/shlink/issues/2015) Update to PHPUnit 11.
|
||||||
|
Loading…
Reference in New Issue
Block a user