summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-02-24 16:37:46 +0000
committerMark Haines <mark.haines@matrix.org>2016-02-24 16:37:46 +0000
commit4ecfbac85fd0aa7350ee36a87dac880828e93660 (patch)
tree5ea0ca064548b545c9fbbae2f86fa4121e287766 /synapse/rest
parentRemove unused get_rule_attr method (diff)
parentMerge pull request #604 from matrix-org/daniel/guestaccesstoken (diff)
downloadsynapse-4ecfbac85fd0aa7350ee36a87dac880828e93660.tar.xz
Merge branch 'develop' into markjh/dead_code
Diffstat (limited to 'synapse/rest')
0 files changed, 0 insertions, 0 deletions