summary refs log tree commit diff
path: root/setup.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-15 14:45:59 +0000
committerErik Johnston <erik@matrix.org>2014-12-15 14:45:59 +0000
commit57e0e619f3ddc68673a0d7b345203b1a52ff1fa1 (patch)
treed7c45715bc9313f7602243b1cd614d95d1a24858 /setup.py
parentAdd beginnings of upgrade script (diff)
parentStill send typing notifications to myself if I'm the only one in the room (it... (diff)
downloadsynapse-57e0e619f3ddc68673a0d7b345203b1a52ff1fa1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Conflicts:
	tests/handlers/test_room.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions