diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-06-14 14:24:25 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-06-14 14:24:25 -0700 |
| commit | a3597d6debfbe6b070782d1744bc0a8ee305e574 (patch) | |
| tree | 09e761c1218b31d4b92fa91eab5659004103a5d8 /tests/test_stream_roster.py | |
| parent | 937dce8e65a1e6c04c6c6eb4a194c6d4b6e89f92 (diff) | |
| parent | dd41a85efcd85bb3a4eb81187041106c65c6aa2d (diff) | |
| download | slixmpp-a3597d6debfbe6b070782d1744bc0a8ee305e574.tar.gz slixmpp-a3597d6debfbe6b070782d1744bc0a8ee305e574.tar.bz2 slixmpp-a3597d6debfbe6b070782d1744bc0a8ee305e574.tar.xz slixmpp-a3597d6debfbe6b070782d1744bc0a8ee305e574.zip | |
Merge branch 'develop' into roster
Conflicts:
sleekxmpp/basexmpp.py
Diffstat (limited to 'tests/test_stream_roster.py')
0 files changed, 0 insertions, 0 deletions