summary refs log tree commit diff
path: root/synapse/static
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-02 11:08:07 +0100
committerErik Johnston <erik@matrix.org>2019-10-02 11:08:07 +0100
commitecd254bc4966c0560fcb65620fe784134484c020 (patch)
treebf847ae3d74b0e79769dc26a3f9787b78dbf9e4e /synapse/static
parentMerge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/s... (diff)
parentMerge pull request #6146 from matrix-org/erikj/fix_destination_retry_timings (diff)
downloadsynapse-ecd254bc4966c0560fcb65620fe784134484c020.tar.xz
Merge branch 'release-v1.4.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/static')
0 files changed, 0 insertions, 0 deletions