diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-03 11:06:29 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-03 11:06:29 +0000 |
| commit | 6f52e90065243682d93e5f89b071e1fb056fa6ab (patch) | |
| tree | 98b9c43dd42dbc3d14a96f1b81e0631c7ac271c9 /synapse/appservice/api.py | |
| parent | Unused import (diff) | |
| parent | Merge pull request #553 from matrix-org/daniel/accesstokenlogging (diff) | |
| download | synapse-6f52e90065243682d93e5f89b071e1fb056fa6ab.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_room_fix
Diffstat (limited to 'synapse/appservice/api.py')
| -rw-r--r-- | synapse/appservice/api.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/appservice/api.py b/synapse/appservice/api.py index e1c07028e8..bc90605324 100644 --- a/synapse/appservice/api.py +++ b/synapse/appservice/api.py @@ -29,7 +29,7 @@ class ApplicationServiceApi(SimpleHttpClient): pushing. """ - def __init__(self, hs): + def __init__(self, hs): super(ApplicationServiceApi, self).__init__(hs) self.clock = hs.get_clock() |