diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-06-02 12:52:51 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-06-02 12:52:51 +0100 |
commit | a6ab7305b97f6863422a95a7a23940fbb09345a8 (patch) | |
tree | 4069fb3c2ecc10bd450128005b95ddcbde30f016 /synapse/replication/presence_resource.py | |
parent | Prod the main synapse with the list of syncing users (diff) | |
parent | Fixes (diff) | |
download | synapse-a6ab7305b97f6863422a95a7a23940fbb09345a8.tar.xz |
Merge branch 'markjh/external_presence' into markjh/synchrotron
Diffstat (limited to 'synapse/replication/presence_resource.py')
-rw-r--r-- | synapse/replication/presence_resource.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/replication/presence_resource.py b/synapse/replication/presence_resource.py |