diff options
author | Erik Johnston <erik@matrix.org> | 2016-09-08 15:33:00 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-09-08 15:33:00 +0100 |
commit | caa22334b3645a02cc13d66204b604a84951dff6 (patch) | |
tree | aa0bca82c80ef8fee8df69773dc9356238bf15fb /synapse/events | |
parent | Merge pull request #1083 from matrix-org/erikj/check_origin (diff) | |
parent | Merge branch 'release-v0.17.2' of github.com:matrix-org/synapse (diff) | |
download | synapse-caa22334b3645a02cc13d66204b604a84951dff6.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions