diff options
author | Erik Johnston <erik@matrix.org> | 2018-03-13 13:17:08 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-03-13 13:17:08 +0000 |
commit | bf8e97bd3c11a4bdae9dcf255922b1ac2d03f5b3 (patch) | |
tree | 42423f71093a796415971f66ec4a24712bab42c2 /tox.ini | |
parent | Add docstring (diff) | |
parent | Merge pull request #2980 from matrix-org/erikj/rm_priv (diff) | |
download | synapse-bf8e97bd3c11a4bdae9dcf255922b1ac2d03f5b3.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/factor_remote_leave
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions