summary refs log tree commit diff
path: root/synapse/handlers/e2e_keys.py
diff options
context:
space:
mode:
authorTravis Ralston <travpc@gmail.com>2018-10-31 13:15:14 -0600
committerTravis Ralston <travpc@gmail.com>2018-10-31 13:15:14 -0600
commitd1e7b9c44c127c8e9ddbbf4c45604a5482448b2e (patch)
treec832189c0f04fa02354feb419d72d6ad64b0e77f /synapse/handlers/e2e_keys.py
parentpep8 (diff)
parentMerge pull request #4101 from matrix-org/rav/aliases_for_upgrades (diff)
downloadsynapse-d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e.tar.xz
Merge branch 'develop' into travis/login-terms
Diffstat (limited to 'synapse/handlers/e2e_keys.py')
0 files changed, 0 insertions, 0 deletions