summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-13 15:46:42 +0000
committerErik Johnston <erik@matrix.org>2015-02-13 15:46:42 +0000
commit650dc7f0f905629c658d0ac4ab1be94c4498d148 (patch)
tree6ba1902569c278db7958379781e8e195fd70ad35 /synapse/appservice
parentMerge pull request #50 from matrix-org/application-services (diff)
parentBump version (diff)
downloadsynapse-650dc7f0f905629c658d0ac4ab1be94c4498d148.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