mirror of
https://github.com/correl/SleekXMPP.git
synced 2024-11-23 19:19:53 +00:00
Merge branch 'develop' into roster
Conflicts: tests/test_stream_roster.py
This commit is contained in:
commit
4c7da3899e
Conflicts: tests/test_stream_roster.py