summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-08-02 15:43:30 +0100
committerRichard van der Hoff <richard@matrix.org>2018-08-02 15:43:30 +0100
commit704c3e62399b47970b1d319740e591a6f08366da (patch)
tree5e906af495e6f27ebd7977810dd3979efca7d35a /tox.ini
parentMerge pull request #3621 from matrix-org/erikj/split_fed_store (diff)
parentMerge tag 'v0.33.1' (diff)
downloadsynapse-704c3e62399b47970b1d319740e591a6f08366da.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions