diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-09-18 10:37:04 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-09-18 10:37:04 -0700 |
| commit | d385b9e708e9e8904ed9a19ac01096c50d521eff (patch) | |
| tree | 305bdaa02f6abf473a411797c0519633bb140b06 /sleekxmpp/plugins/xep_0280/carbons.py | |
| parent | 67147570e9be7f51fd079c98f1d6db35fe28563c (diff) | |
| parent | c2ae1ee8910a60902ec4aa709ef7c26376eede47 (diff) | |
| download | slixmpp-d385b9e708e9e8904ed9a19ac01096c50d521eff.tar.gz slixmpp-d385b9e708e9e8904ed9a19ac01096c50d521eff.tar.bz2 slixmpp-d385b9e708e9e8904ed9a19ac01096c50d521eff.tar.xz slixmpp-d385b9e708e9e8904ed9a19ac01096c50d521eff.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0280/carbons.py')
0 files changed, 0 insertions, 0 deletions