summary refs log tree commit diff
path: root/synapse/config/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-07-21 09:25:30 +0100
committerErik Johnston <erik@matrix.org>2015-07-21 09:25:30 +0100
commit90dbd71c13acf85b2a1c072f51532c32d5c7aa9d (patch)
treee67e413801924887b491969ec825c0c29c1b89b6 /synapse/config/homeserver.py
parents/take/claim/ for end to end key APIs (diff)
parenttypo (diff)
downloadsynapse-90dbd71c13acf85b2a1c072f51532c32d5c7aa9d.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/homeserver.py')
0 files changed, 0 insertions, 0 deletions