diff options
author | David Baker <dave@matrix.org> | 2018-07-19 18:25:25 +0100 |
---|---|---|
committer | David Baker <dave@matrix.org> | 2018-07-19 18:25:25 +0100 |
commit | 2669e494e0e5898fa24ab294b30a0158fb89926d (patch) | |
tree | 5170f0b1f4c18ba7ad60540b601f1433371f85b8 /tests/storage/test_state.py | |
parent | Merge pull request #3557 from matrix-org/dbkr/delete_profiles (diff) | |
parent | Merge pull request #3377 from Valodim/note-affinity (diff) | |
download | synapse-2669e494e0e5898fa24ab294b30a0158fb89926d.tar.xz |
Merge remote-tracking branch 'origin/master' into dinsic
Diffstat (limited to 'tests/storage/test_state.py')
0 files changed, 0 insertions, 0 deletions