diff options
author | David Baker <dave@matrix.org> | 2018-05-24 16:20:53 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2018-05-24 16:20:53 +0100 |
commit | 77a23e2e058bbc02a675bd6e14bff2c9906c68b2 (patch) | |
tree | 5b65ad8562dc2d584b35b47999b5e004ad21b387 /synapse/config/api.py | |
parent | pep8 (diff) | |
parent | Merge pull request #3277 from matrix-org/dbkr/remove_from_user_dir (diff) | |
download | synapse-77a23e2e058bbc02a675bd6e14bff2c9906c68b2.tar.xz |
Merge remote-tracking branch 'origin/develop' into dbkr/unbind
Diffstat (limited to 'synapse/config/api.py')
0 files changed, 0 insertions, 0 deletions