diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-02-14 16:26:23 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-02-14 16:26:23 -0500 |
| commit | d5b3a5282763e4f74816ff392bd8cd47dd9f7a95 (patch) | |
| tree | 10b421c0cf9cf47997162485f35dabdccfffab69 /examples/disco_browser.py | |
| parent | 1a270dc05cc368000f3545975befa0589031b684 (diff) | |
| parent | d709f8db657aa1d1314082d842dd29e2546739c4 (diff) | |
| download | slixmpp-d5b3a5282763e4f74816ff392bd8cd47dd9f7a95.tar.gz slixmpp-d5b3a5282763e4f74816ff392bd8cd47dd9f7a95.tar.bz2 slixmpp-d5b3a5282763e4f74816ff392bd8cd47dd9f7a95.tar.xz slixmpp-d5b3a5282763e4f74816ff392bd8cd47dd9f7a95.zip | |
Merge branch 'develop' into stream_features
Conflicts:
sleekxmpp/xmlstream/stanzabase.py
Diffstat (limited to 'examples/disco_browser.py')
0 files changed, 0 insertions, 0 deletions