484efff156
Conflicts: setup.py sleekxmpp/clientxmpp.py |
||
---|---|---|
.. | ||
__init__.py | ||
atom.py | ||
error.py | ||
htmlim.py | ||
iq.py | ||
message.py | ||
nick.py | ||
presence.py | ||
rootstanza.py | ||
roster.py | ||
stream_error.py | ||
stream_features.py |
484efff156
Conflicts: setup.py sleekxmpp/clientxmpp.py |
||
---|---|---|
.. | ||
__init__.py | ||
atom.py | ||
error.py | ||
htmlim.py | ||
iq.py | ||
message.py | ||
nick.py | ||
presence.py | ||
rootstanza.py | ||
roster.py | ||
stream_error.py | ||
stream_features.py |