diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-04-07 17:26:44 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-04-07 17:26:44 +0100 |
| commit | d6e7333ae47feb1c31753dd2eebd09e42907218b (patch) | |
| tree | 250363cd2d3460c01fb2ab1ad3652d5530446f82 /synapse/config/appservice.py | |
| parent | Merge branch 'develop' into matthew/preview_urls (diff) | |
| parent | Merge pull request #704 from matrix-org/markh/slaveIII (diff) | |
| download | synapse-d6e7333ae47feb1c31753dd2eebd09e42907218b.tar.xz | |
Merge branch 'develop' into matthew/preview_urls
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions