diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-05-20 21:24:09 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-05-20 21:26:45 -0400 |
| commit | 4c7da3899ee47778b749211edf5665cc700eb613 (patch) | |
| tree | a097c878923a5852ab602c5df3c3b770bea61582 /tests/live_multiple_streams.py | |
| parent | 4d3593ac8698676e3b4b987120c19db07c6a76bb (diff) | |
| parent | 4bb226147a0faa3b0c92934f64585357bb197f68 (diff) | |
| download | slixmpp-4c7da3899ee47778b749211edf5665cc700eb613.tar.gz slixmpp-4c7da3899ee47778b749211edf5665cc700eb613.tar.bz2 slixmpp-4c7da3899ee47778b749211edf5665cc700eb613.tar.xz slixmpp-4c7da3899ee47778b749211edf5665cc700eb613.zip | |
Merge branch 'develop' into roster
Conflicts:
tests/test_stream_roster.py
Diffstat (limited to 'tests/live_multiple_streams.py')
0 files changed, 0 insertions, 0 deletions