summary refs log tree commit diff
path: root/UPGRADE.rst
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-10-13 13:32:43 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-10-13 13:32:43 +0100
commit32a453d7ba43f4bbf7160761858367072fe8c43f (patch)
tree3fb96db58bc18f76b2f22bee85824d7024435791 /UPGRADE.rst
parentMerge branch 'develop' into daniel/3pidinvites (diff)
parentMerge pull request #299 from stevenhammerton/sh-cas-required-attribute (diff)
downloadsynapse-32a453d7ba43f4bbf7160761858367072fe8c43f.tar.xz
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'UPGRADE.rst')
0 files changed, 0 insertions, 0 deletions