summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-11-03 15:44:50 +0000
committerErik Johnston <erik@matrix.org>2016-11-03 15:44:50 +0000
commitf594c8a2c36785c3fee5b113c97143745d1b44be (patch)
treec471022f8b1312f481c3f08bcd01a4a2edd374ac /tox.ini
parentAdd some comments (diff)
parentMerge pull request #1192 from matrix-org/erikj/postgres_gist (diff)
downloadsynapse-erikj/new_profile.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/new_profile erikj/new_profile
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions