summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-26 15:45:03 +0100
committerErik Johnston <erik@matrix.org>2014-08-26 15:45:03 +0100
commitff3709e5775aee6e0f2d8cb52eb7138af9babae4 (patch)
treef35b59e54908a4644748489f6c1aa524221d8f2e /synapse/api
parentMerge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff)
parentDetermine and send user presence state (diff)
downloadsynapse-ff3709e5775aee6e0f2d8cb52eb7138af9babae4.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions