diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-01-18 15:34:49 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-01-18 15:34:49 -0800 |
| commit | bd85e9539850f691f39994ade126ccd73371f61d (patch) | |
| tree | 8d2199f4b52d3a842a532cd5659590ca5a75ced4 /tests/test_stream_xep_0128.py | |
| parent | 22cc194ed878ac00715951605dcdee51eb313f1b (diff) | |
| download | slixmpp-bd85e9539850f691f39994ade126ccd73371f61d.tar.gz slixmpp-bd85e9539850f691f39994ade126ccd73371f61d.tar.bz2 slixmpp-bd85e9539850f691f39994ade126ccd73371f61d.tar.xz slixmpp-bd85e9539850f691f39994ade126ccd73371f61d.zip | |
Gah, too many branch conflicts.
Diffstat (limited to 'tests/test_stream_xep_0128.py')
0 files changed, 0 insertions, 0 deletions