diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-05-31 11:05:54 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-05-31 11:05:54 -0700 |
| commit | 83a73ac9b751f6403a43cb341460a46171e0908b (patch) | |
| tree | c60877a9c6896bbefe8fcb51b606a20abac165ee /sleekxmpp/plugins/xep_0085/stanza.py | |
| parent | ccb0eeefbd58361283e4e92d75e5d17aa76c70c7 (diff) | |
| parent | a81162edd2434756e21d7f9a79d71d770a43db7b (diff) | |
| download | slixmpp-83a73ac9b751f6403a43cb341460a46171e0908b.tar.gz slixmpp-83a73ac9b751f6403a43cb341460a46171e0908b.tar.bz2 slixmpp-83a73ac9b751f6403a43cb341460a46171e0908b.tar.xz slixmpp-83a73ac9b751f6403a43cb341460a46171e0908b.zip | |
Merge branch 'develop' into stream_features
Conflicts:
sleekxmpp/clientxmpp.py
Diffstat (limited to 'sleekxmpp/plugins/xep_0085/stanza.py')
0 files changed, 0 insertions, 0 deletions