summary refs log tree commit diff
path: root/AUTHORS.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-01-12 11:28:49 +0000
committerErik Johnston <erik@matrix.org>2018-01-12 11:28:49 +0000
commit81391fa162d6f04771b535ace95e53e2d1b45777 (patch)
tree7ad6e0ff6be63bed9cf9d69408378ba69e04e1cc /AUTHORS.rst
parentRemove unnecessary condition (diff)
parentMerge pull request #2766 from matrix-org/rav/room_event (diff)
downloadsynapse-81391fa162d6f04771b535ace95e53e2d1b45777.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/media_storage_refactor
Diffstat (limited to 'AUTHORS.rst')
0 files changed, 0 insertions, 0 deletions