summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-08-17 10:50:42 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-08-17 10:50:42 +0100
commitbdd201ea7f7c53bce9788bb8d5cd9a0545a76285 (patch)
tree58004f776dee6e070ca83727193bca40780baf80 /synapse/api
parentMerge pull request #5857 from matrix-org/uhoreg/fix_e2e_room_keys_index (diff)
parent1.3.1 (diff)
downloadsynapse-bdd201ea7f7c53bce9788bb8d5cd9a0545a76285.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions