summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-08 09:43:48 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-08 09:43:48 +0000
commit8ac9199f56b9472be450d7d605f454eccb8f2e50 (patch)
tree1155f31341e2a6add943ae5a9e65e695d3b475b5 /synapse/events
parentLog server version on startup (diff)
parentMerge branch 'hotfixes-v0.6.1' (diff)
downloadsynapse-8ac9199f56b9472be450d7d605f454eccb8f2e50.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/events')
0 files changed, 0 insertions, 0 deletions