diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2019-10-03 13:48:45 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-10-03 13:48:45 +0100 |
commit | 6018bec9190362a038767aa7b3ef17739184f7ed (patch) | |
tree | 449e8adc4900f0f2684b732f97baee5ea0d6e8d3 /synapse/state | |
parent | Merge pull request #6154 from matrix-org/erikj/fix_appservice_pagination (diff) | |
parent | Merge tag 'v1.4.0' (diff) | |
download | synapse-6018bec9190362a038767aa7b3ef17739184f7ed.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/state')
0 files changed, 0 insertions, 0 deletions