summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 10:24:32 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-10-06 10:24:32 -0500
commit7c809abe8610826b09a23b44b1d2bb2ba572ef36 (patch)
treebb0dfa368002a77caa3ffdd010877bffabcfe6a4 /synapse/rest
parentRemove merge thinko (diff)
parentMerge pull request #292 from matrix-org/daniel/useragent (diff)
downloadsynapse-7c809abe8610826b09a23b44b1d2bb2ba572ef36.tar.xz
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'synapse/rest')
0 files changed, 0 insertions, 0 deletions