summary refs log tree commit diff
path: root/UPGRADE.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-29 11:33:46 +0100
committerErik Johnston <erik@matrix.org>2016-07-29 11:33:46 +0100
commit2a9ce8c42251ef9737690d1af47ced3f97df270b (patch)
tree833e5bf55225cb688440d838f9c0632d31335658 /UPGRADE.rst
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader (diff)
parentMerge pull request #964 from matrix-org/erikj/fed_join_fix (diff)
downloadsynapse-2a9ce8c42251ef9737690d1af47ced3f97df270b.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
Diffstat (limited to 'UPGRADE.rst')
0 files changed, 0 insertions, 0 deletions