summary refs log tree commit diff
path: root/synapse/python_dependencies.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-05-03 23:39:08 +0100
committerMatthew Hodgson <matthew@matrix.org>2018-05-03 23:39:08 +0100
commit383c4ae59cea831d7006506949376c8a65fd01b8 (patch)
treeef358cadb0648a53e0c686eb00cbc01b45dc397a /synapse/python_dependencies.py
parentspecial case msisdns when deriving mxids from 3pids (diff)
parentMerge pull request #3180 from matrix-org/matthew/disable-3pid-changes (diff)
downloadsynapse-383c4ae59cea831d7006506949376c8a65fd01b8.tar.xz
Merge branch 'dinsic' into matthew/derive-mxid-from-3pid
Diffstat (limited to 'synapse/python_dependencies.py')
0 files changed, 0 insertions, 0 deletions