diff options
author | Erik Johnston <erik@matrix.org> | 2018-04-27 13:28:51 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-04-27 13:28:51 +0100 |
commit | d2737c1fae2b481980869331aebc950786722bde (patch) | |
tree | 4d0b7835933776ada72636394bac05a7de8813ad /tox.ini | |
parent | Merge pull request #3142 from matrix-org/rav/reraise (diff) | |
parent | Update CHANGES.rst (diff) | |
download | synapse-d2737c1fae2b481980869331aebc950786722bde.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