summary refs log tree commit diff
path: root/synapse/util/caches/descriptors.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-14 14:43:28 +0000
committerErik Johnston <erik@matrix.org>2018-03-14 14:43:28 +0000
commit295973e3a976345fdc64bf607972fb2415a26833 (patch)
tree0aaec27dec7cfbacce16be99e93e65614b02fa66 /synapse/util/caches/descriptors.py
parentMerge branch 'rav/request_logging' into matrix-org-hotfixes (diff)
parentMerge pull request #2995 from matrix-org/erikj/enable_membership_worker (diff)
downloadsynapse-295973e3a976345fdc64bf607972fb2415a26833.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/util/caches/descriptors.py')
0 files changed, 0 insertions, 0 deletions