diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2021-05-05 14:25:49 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2021-05-05 14:25:49 +0100 |
commit | a61b13c0a117dd0a06b5a83ef1b176fc0e438c5b (patch) | |
tree | 40b7df8dc6aadc5d67443310d87cc8d181fc72ac /synapse | |
parent | Time external cache response time (#9904) (diff) | |
parent | 1.33.0 (diff) | |
download | synapse-a61b13c0a117dd0a06b5a83ef1b176fc0e438c5b.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py |