summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorJoe Hildebrand <joe-github@cursive.net>2012-10-31 14:44:51 -0600
committerJoe Hildebrand <joe-github@cursive.net>2012-10-31 14:44:51 -0600
commitef1c4368d0b18c55609a75f6494037e2baecc0b3 (patch)
tree626c0287a09b81ed5415de95f9adeb24ad42293a /tox.ini
parent48def71d0c35755d0d34f3be4ebc35a26c12693b (diff)
parent2229ad8d8e51b73a7900b118dfab5d7b449f17ce (diff)
downloadslixmpp-ef1c4368d0b18c55609a75f6494037e2baecc0b3.tar.gz
slixmpp-ef1c4368d0b18c55609a75f6494037e2baecc0b3.tar.bz2
slixmpp-ef1c4368d0b18c55609a75f6494037e2baecc0b3.tar.xz
slixmpp-ef1c4368d0b18c55609a75f6494037e2baecc0b3.zip
Merge branch 'master' of git://github.com/fritzy/SleekXMPP into develop
# By Joe Hildebrand (2) and Lance Stout (1) # Via Lance Stout * 'master' of git://github.com/fritzy/SleekXMPP: Relax timing issues in Iq timeout callback test. update JID_CACHE logic again. Allow IQ timeouts to be asynchronous, by passing a timeout_callback parameter to send(). An example modification of disco is included. If this approach is approved, I'll go through and update the other plugins. Conflicts: tests/test_stream_handlers.py
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions