diff options
author | Erik Johnston <erik@matrix.org> | 2018-07-24 11:32:13 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2018-07-24 11:32:13 +0100 |
commit | 97acd385a326302cb6791cf518db667bbf4f4d2a (patch) | |
tree | 385db0eb20a05b9d0f6b7ce181cc2e2253c24241 /res | |
parent | Remove unnecessary if (diff) | |
parent | Merge pull request #3591 from matrix-org/rav/logcontext_fixes (diff) | |
download | synapse-97acd385a326302cb6791cf518db667bbf4f4d2a.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_calculate_state_delta
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions