summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-05 10:25:13 +0000
committerErik Johnston <erik@matrix.org>2016-01-05 10:25:13 +0000
commit07c33eff43f4c7095c3884c50649e4b498bde038 (patch)
tree6d074d4f84a75f226a542a8e18fb3742855a535d /synapse/handlers
parentMerge remote-tracking branch 'origin/release-v0.12.0' (diff)
parenttypoe (diff)
downloadsynapse-07c33eff43f4c7095c3884c50649e4b498bde038.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/handlers')
0 files changed, 0 insertions, 0 deletions