summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-20 16:10:14 +0100
committerErik Johnston <erik@matrix.org>2015-08-20 16:10:14 +0100
commitb578c822e3f382d6321c76ded3f9bd57c371ab86 (patch)
tree1949a627914b7f22f4450fc76d133db49e278b3b /synapse/events
parentMerge pull request #237 from matrix-org/markjh/readme-rst-formatting (diff)
parentMerge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-b578c822e3f382d6321c76ded3f9bd57c371ab86.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.10.0
Diffstat (limited to 'synapse/events')
0 files changed, 0 insertions, 0 deletions