summary refs log tree commit diff
path: root/synapse/rest/client/v1
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-25 12:35:25 +0000
committerErik Johnston <erik@matrix.org>2016-01-25 12:35:25 +0000
commitd685ae73b481d1503324b09b57583a867b3fa8df (patch)
treece7fde3d2b93e116a042ce63dfcdacd5d23c537a /synapse/rest/client/v1
parentMerge pull request #523 from matrix-org/dbkr/no_push_unless_notify (diff)
parentFix tests (diff)
downloadsynapse-d685ae73b481d1503324b09b57583a867b3fa8df.tar.xz
Merge branch 'erikj/filters' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/rest/client/v1')
0 files changed, 0 insertions, 0 deletions