summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-12-11 18:35:05 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-12-11 18:35:05 +0000
commit0b700233737adfa3c6558e988822e7f9ee31ca39 (patch)
treeeac8aff9fb9f58da245c9c3e7a80fa13ac5e1eb1 /synapse/handlers
parentMerge remote-tracking branch 'origin' into typing_notifications (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-0b700233737adfa3c6558e988822e7f9ee31ca39.tar.xz
Merge branch 'develop' into typing_notifications
Diffstat (limited to 'synapse/handlers')
0 files changed, 0 insertions, 0 deletions