diff options
author | Erik Johnston <erik@matrix.org> | 2018-01-12 11:28:49 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-01-12 11:28:49 +0000 |
commit | 81391fa162d6f04771b535ace95e53e2d1b45777 (patch) | |
tree | 7ad6e0ff6be63bed9cf9d69408378ba69e04e1cc /setup.cfg | |
parent | Remove unnecessary condition (diff) | |
parent | Merge pull request #2766 from matrix-org/rav/room_event (diff) | |
download | synapse-81391fa162d6f04771b535ace95e53e2d1b45777.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/media_storage_refactor
Diffstat (limited to 'setup.cfg')
0 files changed, 0 insertions, 0 deletions