diff options
author | Erik Johnston <erik@matrix.org> | 2016-01-25 12:49:45 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-01-25 12:49:45 +0000 |
commit | 42deca50c2c2d15e78e1861088297fe20b88cd32 (patch) | |
tree | d79bbc7dee4e491f0a31a275fdf338be9afd0618 /synapse/app | |
parent | Move logic from rest/ to handlers/ (diff) | |
parent | Merge branch 'erikj/filters' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-42deca50c2c2d15e78e1861088297fe20b88cd32.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions