diff options
author | Erik Johnston <erik@matrix.org> | 2016-08-24 14:50:42 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-08-24 14:50:42 +0100 |
commit | eb6a7cf3f40e96a6c7eb79ab8f0e02ee58bcf38b (patch) | |
tree | 1c843a49d3d5168ff998a54f50d30cdc3814f104 /synapse/appservice/api.py | |
parent | Merge pull request #1042 from matrix-org/erikj/preserve_log_contexts (diff) | |
parent | Bump changelog and version (diff) | |
download | synapse-eb6a7cf3f40e96a6c7eb79ab8f0e02ee58bcf38b.tar.xz |
Merge branch 'release-v0.17.1' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/appservice/api.py')
0 files changed, 0 insertions, 0 deletions