summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-02-02 11:05:57 +0000
committerErik Johnston <erik@matrix.org>2017-02-02 11:05:57 +0000
commitcc01eae332cd2db10d5eef8a0f19a1ec17a14c45 (patch)
treec9315eccef2a281605efd28710e45f95a8de3b97 /synapse/config
parentUpdate changelog (diff)
parentMerge pull request #1872 from matrix-org/erikj/key_changes (diff)
downloadsynapse-cc01eae332cd2db10d5eef8a0f19a1ec17a14c45.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.19.0
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions