summary refs log tree commit diff
path: root/tests/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-06 13:37:56 +0100
committerErik Johnston <erik@matrix.org>2015-08-06 13:37:56 +0100
commitf596ff402e49c963b94c398cfb9dbc9d92046b82 (patch)
treecfaaa4e7f18a6379562bcae641cffad37d6b4327 /tests/api
parentMerge branch 'erikj/cached_keyword_args' of github.com:matrix-org/synapse int... (diff)
parentMerge branch 'erikj/cached_keyword_args' into erikj/cache_deferreds (diff)
downloadsynapse-f596ff402e49c963b94c398cfb9dbc9d92046b82.tar.xz
Merge branch 'erikj/cache_deferreds' into erikj/dictionary_cache
Diffstat (limited to 'tests/api')
0 files changed, 0 insertions, 0 deletions