diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-02 11:08:07 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-10-02 11:08:07 +0100 |
commit | ecd254bc4966c0560fcb65620fe784134484c020 (patch) | |
tree | bf847ae3d74b0e79769dc26a3f9787b78dbf9e4e /synapse/config/appservice.py | |
parent | Merge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/s... (diff) | |
parent | Merge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings (diff) | |
download | synapse-ecd254bc4966c0560fcb65620fe784134484c020.tar.xz |
Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions