Merge branch 'develop' of github.com:matrix-org/synapse into erikj-perf

1 files changed, 3 insertions, 0 deletions

diff --git a/synapse/types.py b/synapse/types.py

index faac729ff2..f6a1b0bbcf 100644
--- a/synapse/types.py
+++ b/synapse/types.py
@@ -119,3 +119,6 @@ class StreamToken(
         d = self._asdict()
         d[key] = new_value
         return StreamToken(**d)
+
+
+ClientInfo = namedtuple("ClientInfo", ("device_id", "token_id"))