summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-04-27 13:28:51 +0100
committerErik Johnston <erik@matrix.org>2018-04-27 13:28:51 +0100
commitd2737c1fae2b481980869331aebc950786722bde (patch)
tree4d0b7835933776ada72636394bac05a7de8813ad /synapse
parentMerge pull request #3142 from matrix-org/rav/reraise (diff)
parentUpdate CHANGES.rst (diff)
downloadsynapse-d2737c1fae2b481980869331aebc950786722bde.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
0 files changed, 0 insertions, 0 deletions