summary refs log tree commit diff
path: root/contrib
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-03-29 10:57:19 +0100
committerErik Johnston <erik@matrix.org>2017-03-29 10:57:19 +0100
commit4ad613f6be7211edf4b39d7b031bc7d2947d8297 (patch)
treed3e1835e7d3f5694098d06b093edcf2cd7d0e60f /contrib
parentCorrectly look up key (diff)
parentMerge pull request #2037 from ricco386/fix_readme_centos_issues (diff)
downloadsynapse-4ad613f6be7211edf4b39d7b031bc7d2947d8297.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/e2e_one_time_upsert
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions