diff options
| author | Florent Le Coz <louiz@louiz.org> | 2015-05-16 20:42:30 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2015-05-16 20:42:30 +0200 |
| commit | 0d1ea0d8c33714d874a7f74e8be2ba2a0612ebb3 (patch) | |
| tree | 7b0aa030c8e67055802ecd8ce7dbfdd95e96a8ad /plugins | |
| parent | 1914cfe00365e67e8d82554cd10d2e35f68ad60d (diff) | |
| parent | 1faf8576e22948e51c8493f05d6f576588ad847a (diff) | |
| download | poezio-0d1ea0d8c33714d874a7f74e8be2ba2a0612ebb3.tar.gz poezio-0d1ea0d8c33714d874a7f74e8be2ba2a0612ebb3.tar.bz2 poezio-0d1ea0d8c33714d874a7f74e8be2ba2a0612ebb3.tar.xz poezio-0d1ea0d8c33714d874a7f74e8be2ba2a0612ebb3.zip | |
Merge branch 'self-ping' into HEAD
Conflicts:
src/tabs/muctab.py
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ping.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/plugins/ping.py b/plugins/ping.py index 4ec706b3..a28406d1 100644 --- a/plugins/ping.py +++ b/plugins/ping.py @@ -31,8 +31,6 @@ import time class Plugin(BasePlugin): def init(self): - self.core.xmpp.register_plugin('xep_0199') - self.core.xmpp.plugin['xep_0115'].update_caps() self.api.add_command('ping', self.command_ping, usage='<jid>', help='Send an XMPP ping to jid (see XEP-0199).', |