diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:23:39 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-08-13 17:23:39 +0100 |
commit | b16cd18a86a530d955d38bbdbc03daa0d70a2f9b (patch) | |
tree | 8a2e6eb451ec5121affe2afc13ce95ab6fcc4bfd /synapse/config/appservice.py | |
parent | Doc-string for config ultility function (diff) | |
parent | Merge pull request #224 from matrix-org/erikj/reactor_metrics (diff) | |
download | synapse-b16cd18a86a530d955d38bbdbc03daa0d70a2f9b.tar.xz |
Merge remote-tracking branch 'origin/develop' into erikj/generate_presice_thumbnails
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions