diff options
author | Erik Johnston <erik@matrix.org> | 2017-05-15 16:09:32 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-05-15 16:09:32 +0100 |
commit | f451b64c8f8db1eebdc7c8bc80352e011b8ae978 (patch) | |
tree | 0f2926b280ee625fd0777effd1b0f840ade7d438 /UPGRADE.rst | |
parent | Update comment (diff) | |
parent | Merge pull request #2221 from psaavedra/sync_timeline_limit_filter_by_name (diff) | |
download | synapse-f451b64c8f8db1eebdc7c8bc80352e011b8ae978.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_state
Diffstat (limited to 'UPGRADE.rst')
-rw-r--r-- | UPGRADE.rst | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/UPGRADE.rst b/UPGRADE.rst |