summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-01-30 15:00:56 +0000
committerMark Haines <mjark@negativecurvature.net>2015-01-30 15:00:56 +0000
commit9bfc8bf7523faf213f5c00bf70cce40b093d05ad (patch)
tree766c9a589fc9f3b8aa7109b43df51a8984bdd1d2 /synapse/rest/client
parentMerge pull request #37 from matrix-org/client_v2_filter (diff)
parentRemove merge conflict (diff)
downloadsynapse-9bfc8bf7523faf213f5c00bf70cce40b093d05ad.tar.xz
Merge pull request #40 from matrix-org/rejections_storage
Rejections storage
Diffstat (limited to 'synapse/rest/client')
0 files changed, 0 insertions, 0 deletions