summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-11-07 13:32:35 +0000
committerErik Johnston <erik@matrix.org>2017-11-07 13:32:35 +0000
commit76c9af193cb46337cd1e618b46508d7f0ee912e7 (patch)
tree769917ca0abb14e2cab4dd979e397dd10bebe0a7 /synapse/events
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-76c9af193cb46337cd1e618b46508d7f0ee912e7.tar.xz
Revert "Merge branch 'master' of github.com:matrix-org/synapse into develop"
This reverts commit f9b255cd62fe724e16b2222f6af623b2d39282ab, reversing
changes made to 1bd654dabde776bbb7ee365c115b307cd6a110b8.
Diffstat (limited to 'synapse/events')
0 files changed, 0 insertions, 0 deletions