summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-19 16:37:08 +0000
committerErik Johnston <erik@matrix.org>2014-12-19 16:37:08 +0000
commitd61109f5781fecfdc8b3ea1f1ae74a72f8a2a913 (patch)
treedff914dc74740d36be1da73be66a8b06c6c4feea /contrib
parentMerge branch 'release-v0.6.0' of github.com:matrix-org/synapse into erikj-perf (diff)
parentSet a state_key for the topic and room name, otherwise they won't be treated ... (diff)
downloadsynapse-d61109f5781fecfdc8b3ea1f1ae74a72f8a2a913.tar.xz
Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perf
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions