summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-25 12:49:45 +0000
committerErik Johnston <erik@matrix.org>2016-01-25 12:49:45 +0000
commit42deca50c2c2d15e78e1861088297fe20b88cd32 (patch)
treed79bbc7dee4e491f0a31a275fdf338be9afd0618 /demo
parentMove logic from rest/ to handlers/ (diff)
parentMerge branch 'erikj/filters' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-42deca50c2c2d15e78e1861088297fe20b88cd32.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions