summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-20 13:33:45 +0000
committerDavid Baker <dave@matrix.org>2016-01-20 13:33:45 +0000
commitccf9387d57ba57e3b996b48134cfac8142a19cbe (patch)
treed58abd587b00c88dcc6ec127df68f0d29d5cb112 /tox.ini
parentMerge branch 'develop' into push_badge_counts (diff)
parentMerge pull request #506 from matrix-org/erikj/push_fast (diff)
downloadsynapse-ccf9387d57ba57e3b996b48134cfac8142a19cbe.tar.xz
Merge branch 'develop' into push_badge_counts
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions