summary refs log tree commit diff
path: root/UPGRADE.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-09 13:21:06 +0100
committerErik Johnston <erik@matrix.org>2016-05-09 13:21:06 +0100
commitc9eb6dfc1bceb3a7fe9e5cb599df9ba8a05ff839 (patch)
treee6791617720f3d92c417afd97d382eadb2123242 /UPGRADE.rst
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user (diff)
parentMerge pull request #773 from matrix-org/erikj/get_domian_from_id (diff)
downloadsynapse-c9eb6dfc1bceb3a7fe9e5cb599df9ba8a05ff839.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ignore_user
Diffstat (limited to 'UPGRADE.rst')
0 files changed, 0 insertions, 0 deletions