diff options
author | Richard van der Hoff <richard@matrix.org> | 2016-01-14 15:04:08 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2016-01-14 15:04:08 +0000 |
commit | 2978053d167ab8daef0213c04d634bf9dcd8143b (patch) | |
tree | ee0a21ca58d124bd9a83363ce079066ef8fadcef /synapse/api | |
parent | Merge pull request #496 from matrix-org/daniel/3 (diff) | |
parent | Merge pull request #492 from matrix-org/rav/event_context_shiz_release (diff) | |
download | synapse-2978053d167ab8daef0213c04d634bf9dcd8143b.tar.xz |
Merge branch 'release-v0.12.1' into develop
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions