Fixed merge conflicts

CHANGELOG.md

@@ -52,6 +52,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this
 * *Nothing*
 
 
+## [2.10.3] - 2022-01-23
+### Added
+* *Nothing*
+
+### Changed
+* *Nothing*
+
+### Deprecated
+* *Nothing*
+
+### Removed
+* *Nothing*
+
+### Fixed
+* [#1349](https://github.com/shlinkio/shlink/issues/1349) Fixed memory leak in cache implementation.
+
+
 ## [2.10.2] - 2022-01-07
 ### Added
 * *Nothing*

composer.json

@@ -47,7 +47,7 @@
         "predis/predis": "^1.1",
         "pugx/shortid-php": "^1.0",
         "ramsey/uuid": "^4.2",
-        "shlinkio/shlink-common": "dev-main#cbcff58 as 4.4",
+        "shlinkio/shlink-common": "^4.4",
         "shlinkio/shlink-config": "dev-main#483cf8a as 1.6",
         "shlinkio/shlink-event-dispatcher": "^2.3",
         "shlinkio/shlink-importer": "^2.5",

config/autoload/redis.global.php

@@ -11,7 +11,6 @@ return (static function (): array {
         null => [],
         default => [
             'cache' => [
-                'default_lifetime' => 86400, // 24h
                 'redis' => [
                     'servers' => $redisServers,
                     'sentinel_service' => EnvVars::REDIS_SENTINEL_SERVICE()->loadFromEnv(),