diff options
| author | Lance Stout <lancestout@gmail.com> | 2010-11-17 02:00:20 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2010-11-17 02:01:12 -0500 |
| commit | 26aca2b789f62123819041229ba40ab10268f49e (patch) | |
| tree | 20388fb0559ed85f7143eb3b8a669142cdc43f6b /conn_tests/testconfig.ini | |
| parent | 4f69a03bb1a8caab7899bd04f97b7975a78f2f34 (diff) | |
| parent | 5424ede413393db5b835686e8544a9b703fb113b (diff) | |
| download | slixmpp-26aca2b789f62123819041229ba40ab10268f49e.tar.gz slixmpp-26aca2b789f62123819041229ba40ab10268f49e.tar.bz2 slixmpp-26aca2b789f62123819041229ba40ab10268f49e.tar.xz slixmpp-26aca2b789f62123819041229ba40ab10268f49e.zip | |
Merge branch 'roster' of github.com:fritzy/SleekXMPP into roster
Conflicts:
sleekxmpp/basexmpp.py
sleekxmpp/roster.py
sleekxmpp/test/sleektest.py
tests/test_stream_presence.py
tests/test_stream_roster.py
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions