summary refs log tree commit diff
path: root/synapse/config/key.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-05 18:44:49 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-05 18:44:49 +0000
commit247543408070d25c6bd16bf46edb7ccbec4fe46f (patch)
treec9e818e8ba5291156cbbbe86afd86767f9af0009 /synapse/config/key.py
parentFilter user directory state query to a subset of state events (#4462) (diff)
parentv0.99.0 (diff)
downloadsynapse-247543408070d25c6bd16bf46edb7ccbec4fe46f.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config/key.py')
0 files changed, 0 insertions, 0 deletions