summary refs log tree commit diff
path: root/synapse/config/appservice.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-06 13:35:28 +0100
committerErik Johnston <erik@matrix.org>2015-08-06 13:35:28 +0100
commit2efb93af529db0beecd4ff023c9d7f1cdadac0aa (patch)
tree41f592ee25114a50ae4b699e9d04136942161c3c /synapse/config/appservice.py
parentMake @cached cache deferreds rather than the deferreds' values (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/cached_key... (diff)
downloadsynapse-2efb93af529db0beecd4ff023c9d7f1cdadac0aa.tar.xz
Merge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds
Diffstat (limited to 'synapse/config/appservice.py')
0 files changed, 0 insertions, 0 deletions