summary refs log tree commit diff
path: root/LICENSE
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-16 11:18:45 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-16 11:18:45 +0000
commit4fab578b434814cd283fe77bb62b2b8a771aac92 (patch)
tree08720e856f92728987fc56a18c67b46ed3667ea6 /LICENSE
parentMerge pull request #443 from matrix-org/markjh/commentary (diff)
parentMerge pull request #445 from matrix-org/markjh/rebind_threepid (diff)
downloadsynapse-4fab578b434814cd283fe77bb62b2b8a771aac92.tar.xz
Merge branch 'release-v0.12.0' into develop
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions