summary refs log tree commit diff
path: root/synapse/handlers/device.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-02-02 15:23:45 +0000
committerErik Johnston <erik@matrix.org>2017-02-02 15:23:45 +0000
commit99fa03e8b55eee0d69f654ba61c3f31f9f6afde1 (patch)
tree5eccc1feae37e9ba87085718a6340e1d0147ad2f /synapse/handlers/device.py
parentsets aren't JSON serializable (diff)
parentMerge pull request #1876 from matrix-org/erikj/shared_member_store (diff)
downloadsynapse-99fa03e8b55eee0d69f654ba61c3f31f9f6afde1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/device_list_fixes
Diffstat (limited to 'synapse/handlers/device.py')
0 files changed, 0 insertions, 0 deletions