summary refs log tree commit diff
path: root/synapse/http/client.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-10 16:47:16 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-10 16:47:16 +0000
commit29b4ea2fc46e76dab44c6fff6c774120744dd6ad (patch)
tree8d433ff4cdf1696c8ff43e0aef1daf5411e705f5 /synapse/http/client.py
parentMerge pull request #5440 from matrix-org/babolivier/third_party_event_rules (diff)
parentMerge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state (diff)
downloadsynapse-29b4ea2fc46e76dab44c6fff6c774120744dd6ad.tar.xz
Merge pull request #5464 from matrix-org/erikj/3pid_remote_invite_state
Diffstat (limited to 'synapse/http/client.py')
0 files changed, 0 insertions, 0 deletions