diff options
author | Erik Johnston <erik@matrix.org> | 2017-02-02 11:05:57 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-02-02 11:05:57 +0000 |
commit | cc01eae332cd2db10d5eef8a0f19a1ec17a14c45 (patch) | |
tree | c9315eccef2a281605efd28710e45f95a8de3b97 /synapse/config | |
parent | Update changelog (diff) | |
parent | Merge pull request #1872 from matrix-org/erikj/key_changes (diff) | |
download | synapse-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