summary refs log tree commit diff
path: root/static
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-10 13:53:09 +0100
committerErik Johnston <erik@matrix.org>2015-08-10 13:53:09 +0100
commit6f274f7e13865c0ad3c5016c30a7af16586c6f6d (patch)
treeeea76ae320a515efb19ed1e7e8f1d43becddc411 /static
parentMerge branch 'erikj/cache_varargs_interface' of github.com:matrix-org/synapse... (diff)
parentMerge pull request #215 from matrix-org/erikj/cache_varargs_interface (diff)
downloadsynapse-6f274f7e13865c0ad3c5016c30a7af16586c6f6d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'static')
0 files changed, 0 insertions, 0 deletions