summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-27 17:30:31 +0000
committerErik Johnston <erik@matrix.org>2014-11-27 17:30:31 +0000
commitc4bdeb5f0e83a46b3691628eae2ba2ef296bdb15 (patch)
tree95a6f38fb1d7d588dcb9b37bee63de8daeb163e3 /contrib
parentMerge branch 'release-v0.5.3' of github.com:matrix-org/synapse into develop (diff)
parentBump version (diff)
downloadsynapse-c4bdeb5f0e83a46b3691628eae2ba2ef296bdb15.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions