Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-11-17 | Merge branch 'roster' of github.com:fritzy/SleekXMPP into roster | Lance Stout | |
Conflicts: sleekxmpp/basexmpp.py sleekxmpp/roster.py sleekxmpp/test/sleektest.py tests/test_stream_presence.py tests/test_stream_roster.py |