summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-12-09 16:05:12 +0000
committerRichard van der Hoff <richard@matrix.org>2016-12-09 16:05:12 +0000
commit4a9c38bfa3246bb6687379d7d638729959f71ecc (patch)
tree22b12e4286622ab3757dc771626fc6c9b681bc35 /setup.py
parentMerge pull request #1680 from matrix-org/erikj/joined_rooms (diff)
downloadsynapse-4a9c38bfa3246bb6687379d7d638729959f71ecc.tar.xz
Fix broken README merge
When 546ec1a was merged into develop, I accidentally overwrote the change
introduced in debbea5 (pr #1657). Reintroduce it.
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions