diff options
author | Erik Johnston <erik@matrix.org> | 2019-09-25 17:53:13 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-09-25 17:53:13 +0100 |
commit | 4fb3c129aa96377d5b78c9e39d42eee2a4e9ae88 (patch) | |
tree | 7780de5531566372372992521f2476551a51be73 /synapse/util/module_loader.py | |
parent | Review comments (diff) | |
parent | Merge pull request #6089 from matrix-org/erikj/cleanup_user_ips (diff) | |
download | synapse-4fb3c129aa96377d5b78c9e39d42eee2a4e9ae88.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/cleanup_user_ips_2
Diffstat (limited to 'synapse/util/module_loader.py')
-rw-r--r-- | synapse/util/module_loader.py | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/synapse/util/module_loader.py b/synapse/util/module_loader.py |