summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-09-15 16:35:34 +0100
committerErik Johnston <erik@matrix.org>2015-09-15 16:35:34 +0100
commit1107e83b5429e2465bcd52952154ba1ad01acd54 (patch)
tree1e0af30cdf60e92faafb1cd6f903dc9c06ccd607 /synapse/appservice
parentMerge pull request #280 from matrix-org/paul/sighup (diff)
parentBump version/changelog (diff)
downloadsynapse-1107e83b5429e2465bcd52952154ba1ad01acd54.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions