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/otr.py | |
| 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/otr.py')
0 files changed, 0 insertions, 0 deletions