• mathieui's avatar
    Merge branch 'develop' of https://github.com/fritzy/SleekXMPP into sleek-merge · acc52fd9
    mathieui authored
     Conflicts:
    	README.rst
    	examples/IoT_TestDevice.py
    	examples/disco_browser.py
    	setup.py
    	sleekxmpp/jid.py
    	sleekxmpp/plugins/google/auth/stanza.py
    	sleekxmpp/plugins/google/gmail/notifications.py
    	sleekxmpp/plugins/google/nosave/stanza.py
    	sleekxmpp/plugins/google/settings/settings.py
    	sleekxmpp/thirdparty/__init__.py
    	sleekxmpp/thirdparty/socks.py
    	sleekxmpp/thirdparty/statemachine.py
    	sleekxmpp/util/__init__.py
    	sleekxmpp/xmlstream/xmlstream.py
    	slixmpp/basexmpp.py
    	slixmpp/plugins/xep_0004/stanza/form.py
    	slixmpp/plugins/xep_0009/rpc.py
    	slixmpp/plugins/xep_0050/adhoc.py
    	slixmpp/plugins/xep_0065/proxy.py
    	slixmpp/plugins/xep_0084/stanza.py
    	slixmpp/plugins/xep_0202/time.py
    	slixmpp/plugins/xep_0323/sensordata.py
    	slixmpp/plugins/xep_0325/control.py
    	slixmpp/plugins/xep_0325/stanza/control.py
    	slixmpp/roster/single.py
    	slixmpp/stanza/atom.py
    	slixmpp/stanza/rootstanza.py
    	slixmpp/test/slixtest.py
    	slixmpp/util/sasl/mechanisms.py
    	slixmpp/version.py
    	slixmpp/xmlstream/stanzabase.py
    	tests/test_stanza_xep_0323.py
    	tests/test_stanza_xep_0325.py
    	tests/test_stream_xep_0323.py
    	tests/test_stream_xep_0325.py
    acc52fd9