summary refs log tree commit diff
path: root/static
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-07 19:26:54 +0100
committerErik Johnston <erik@matrix.org>2015-08-07 19:26:54 +0100
commit2352974aab49862252652d3d69ac1b16e930da7c (patch)
tree0f24f5bf20e5f752a95e5161ff63b0b082b37c5b /static
parentMerge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into er... (diff)
parents/observed/observer/ (diff)
downloadsynapse-2352974aab49862252652d3d69ac1b16e930da7c.tar.xz
Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into erikj/cache_varargs_interface
Diffstat (limited to 'static')
0 files changed, 0 insertions, 0 deletions