summary refs log tree commit diff
path: root/stubs/txredisapi.pyi
diff options
context:
space:
mode:
authorJason Robinson <jasonr@matrix.org>2021-01-26 10:15:32 +0200
committerJason Robinson <jasonr@matrix.org>2021-01-26 10:15:32 +0200
commitcee4010f94f8f4dadbdaadac5a62c54c19e17505 (patch)
treea73dc2cc9375f445402a4534adf4bc779c1d0d37 /stubs/txredisapi.pyi
parentMake natural join inner join (diff)
parentDon't error if deleting a non-existent pusher. (#9121) (diff)
downloadsynapse-cee4010f94f8f4dadbdaadac5a62c54c19e17505.tar.xz
Merge branch 'develop' into jaywink/admin-forward-extremities
# Conflicts:
#	synapse/rest/admin/__init__.py
Diffstat (limited to 'stubs/txredisapi.pyi')
-rw-r--r--stubs/txredisapi.pyi1
1 files changed, 0 insertions, 1 deletions
diff --git a/stubs/txredisapi.pyi b/stubs/txredisapi.pyi
index bfac6840e6..726454ba31 100644
--- a/stubs/txredisapi.pyi
+++ b/stubs/txredisapi.pyi
@@ -15,7 +15,6 @@
 
 """Contains *incomplete* type hints for txredisapi.
 """
-
 from typing import List, Optional, Type, Union
 
 class RedisProtocol: