diff options
author | Joe Hildebrand <joe-github@cursive.net> | 2012-10-31 12:49:33 -0600 |
---|---|---|
committer | Joe Hildebrand <joe-github@cursive.net> | 2012-10-31 12:49:33 -0600 |
commit | 48def71d0c35755d0d34f3be4ebc35a26c12693b (patch) | |
tree | d26b36700616356c5668c32d0a5db29f885c0239 /docs/features.rst | |
parent | c8c20fff71c31cfcaee9cda44b4cfddfd0763cc2 (diff) | |
parent | 12e8bb6ddcd686ec9835ba478a112984e65120a1 (diff) | |
download | slixmpp-48def71d0c35755d0d34f3be4ebc35a26c12693b.tar.gz slixmpp-48def71d0c35755d0d34f3be4ebc35a26c12693b.tar.bz2 slixmpp-48def71d0c35755d0d34f3be4ebc35a26c12693b.tar.xz slixmpp-48def71d0c35755d0d34f3be4ebc35a26c12693b.zip |
Merge branch 'master' of git://github.com/fritzy/SleekXMPP into develophildjj-dev
# By Lance Stout
# Via Lance Stout
* 'master' of git://github.com/fritzy/SleekXMPP:
Turns out not all data is UTF-8, so don't try to decode it.
Diffstat (limited to 'docs/features.rst')
0 files changed, 0 insertions, 0 deletions