diff options
author | Erik Johnston <erik@matrix.org> | 2016-01-28 14:46:08 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-01-28 14:46:08 +0000 |
commit | 19fd4259284598a89036418de62e88a282db9566 (patch) | |
tree | 2129256c6f81a4274f18c36ccd81173780949c59 /UPGRADE.rst | |
parent | Change load limit params (diff) | |
parent | Merge pull request #534 from matrix-org/erikj/setup (diff) | |
download | synapse-19fd4259284598a89036418de62e88a282db9566.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions