summary refs log tree commit diff
path: root/static
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-22 13:17:14 +0100
committerErik Johnston <erik@matrix.org>2015-10-22 13:17:14 +0100
commit1fc2d11a14602a340d935ac90307afb2c473edb4 (patch)
tree9e62f8773a32fc24f1951a2601fee1f9afabc178 /static
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/search (diff)
parentMerge pull request #319 from matrix-org/erikj/filter_refactor (diff)
downloadsynapse-1fc2d11a14602a340d935ac90307afb2c473edb4.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'static')
0 files changed, 0 insertions, 0 deletions