Merge remote-tracking branch 'origin/release-v1.13.0' into matrix-org-hotfixes

1 files changed, 0 insertions, 1 deletions

diff --git a/synapse/config/redis.py b/synapse/config/redis.py

index 81a27619ec..d5d3ca1c9e 100644
--- a/synapse/config/redis.py
+++ b/synapse/config/redis.py
@@ -31,5 +31,4 @@ class RedisConfig(Config):
 
         self.redis_host = redis_config.get("host", "localhost")
         self.redis_port = redis_config.get("port", 6379)
-        self.redis_dbid = redis_config.get("dbid")
         self.redis_password = redis_config.get("password")