summary refs log tree commit diff
path: root/UPGRADE.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-24 10:38:21 +0100
committerErik Johnston <erik@matrix.org>2016-08-24 10:38:21 +0100
commit86bcf4d6a7f40a60b1a3d8b607f8a670963c9fb2 (patch)
tree50909a17ae7cc6b26f3b70d2286aa43d9418bbf9 /UPGRADE.rst
parentAdd None checks to backfill (diff)
parentMerge pull request #1039 from matrix-org/kegan/join-with-custom-content (diff)
downloadsynapse-86bcf4d6a7f40a60b1a3d8b607f8a670963c9fb2.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/pagination
Diffstat (limited to 'UPGRADE.rst')
0 files changed, 0 insertions, 0 deletions