diff options
author | Erik Johnston <erik@matrix.org> | 2021-05-05 10:14:07 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-05-05 10:14:07 +0100 |
commit | a94edad23b6caa4769ef00fc42ca62da7fb39c08 (patch) | |
tree | fb0e049daf04215c67179ddbbdf230032b478615 /synapse/python_dependencies.py | |
parent | fix logging contexts (diff) | |
parent | Merge remote-tracking branch 'origin/develop' into erikj/cache_mem_size (diff) | |
download | synapse-a94edad23b6caa4769ef00fc42ca62da7fb39c08.tar.xz |
Merge branch 'erikj/cache_mem_size' into erikj/test_send
Diffstat (limited to 'synapse/python_dependencies.py')
-rw-r--r-- | synapse/python_dependencies.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py |