diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-26 13:42:45 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-26 13:42:45 +0100 |
commit | d3c0e488591386b7d24d23c6f6d3b237523fca89 (patch) | |
tree | a0d8c139b8ec3087421ff039902088980d4534f8 /tox.ini | |
parent | Merge pull request #251 from matrix-org/removeadmin (diff) | |
download | synapse-d3c0e488591386b7d24d23c6f6d3b237523fca89.tar.xz |
Merge erikj/user_dedup to develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions