diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-05 18:00:51 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-05 18:00:51 +0000 |
| commit | f23af34729e0e226f0fe1dc505d13ce589a8afae (patch) | |
| tree | 379600a3af98606ae834275c44289516f9c47689 /tox.ini | |
| parent | Add PR (diff) | |
| parent | Merge pull request #350 from matrix-org/erikj/search (diff) | |
| download | synapse-f23af34729e0e226f0fe1dc505d13ce589a8afae.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions