summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 10:16:15 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 10:16:15 -0500
commit61ee72517c96d1b25746e4baea0febcc63b405fd (patch)
tree9f8ceaab60e8dce7515b3f4f47f9b9948fe02a1c /tox.ini
parentAdd third party invites to auth_events for joins (diff)
downloadsynapse-61ee72517c96d1b25746e4baea0febcc63b405fd.tar.xz
Remove merge thinko
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions