diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-05-20 13:23:48 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-05-20 13:23:48 -0400 |
| commit | e3b14bc5a9fde7037b309359be8ff1abf5447735 (patch) | |
| tree | 616dab4df473cde21edf33f52537b7d66bc21b45 /sleekxmpp/stanza/htmlim.py | |
| parent | 8e46aa70543eb6cc003b69877e7677480db3a4dc (diff) | |
| parent | 9f1648328f17b608651989606b9cf2636cdcfbec (diff) | |
| download | slixmpp-e3b14bc5a9fde7037b309359be8ff1abf5447735.tar.gz slixmpp-e3b14bc5a9fde7037b309359be8ff1abf5447735.tar.bz2 slixmpp-e3b14bc5a9fde7037b309359be8ff1abf5447735.tar.xz slixmpp-e3b14bc5a9fde7037b309359be8ff1abf5447735.zip | |
Merge branch 'develop' into roster
Conflicts:
sleekxmpp/clientxmpp.py
tests/test_stream_roster.py
Diffstat (limited to 'sleekxmpp/stanza/htmlim.py')
0 files changed, 0 insertions, 0 deletions