diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-12-09 16:13:52 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-12-09 16:13:52 +0000 |
commit | a4a5c7a35e3231f0a7ad799e0d2fce8c3e69603b (patch) | |
tree | 11f86252771d5e0dda02674d2ebaaca5bca41b7b /synapse/storage/state.py | |
parent | Merge branch 'release-v1.24.0' into develop (diff) | |
parent | Merge pull request #8906 from matrix-org/rav/fix_multiarch_builds (diff) | |
download | synapse-a4a5c7a35e3231f0a7ad799e0d2fce8c3e69603b.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'synapse/storage/state.py')
0 files changed, 0 insertions, 0 deletions