summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-02-11 16:02:17 +0000
committerErik Johnston <erik@matrix.org>2016-02-11 16:02:17 +0000
commita79af259e91a6999a4a95ffe8c460e7c2705a32f (patch)
treec804c85b15b71460f0c1548a5638f7f9c59197a8 /tox.ini
parentFix SYN-627, events are in incorrect room in /sync (diff)
parentMerge branch 'release-v0.13.2' of github.com:matrix-org/synapse (diff)
downloadsynapse-a79af259e91a6999a4a95ffe8c460e7c2705a32f.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions