summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-09 18:06:01 +0100
committerErik Johnston <erik@matrix.org>2016-09-09 18:06:01 +0100
commit3265def8c7b4a6e49bc9ee920aef45bb22beaf74 (patch)
tree0f069dbf73fc1abc5955922eb46b50598f5d9b6f /contrib
parentFix incorrect attribute name (diff)
parentMerge pull request #1096 from matrix-org/markjh/get_access_token (diff)
downloadsynapse-3265def8c7b4a6e49bc9ee920aef45bb22beaf74.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/batch_edus
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions