diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-22 20:10:07 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-22 20:10:07 -0700 |
| commit | 3655827ef2e268e9ab327e4a6c788c3e336146e0 (patch) | |
| tree | 06a916dbfb9ce40897fd56a2051bbeeea64d6e17 /sleekxmpp/plugins/xep_0095/stream_initiation.py | |
| parent | 12e0e1a16b56f8a4797912ae0ab4c057c07b0b9f (diff) | |
| parent | c5046b9c91a77488424c1f77407a2875a9fea45a (diff) | |
| download | slixmpp-3655827ef2e268e9ab327e4a6c788c3e336146e0.tar.gz slixmpp-3655827ef2e268e9ab327e4a6c788c3e336146e0.tar.bz2 slixmpp-3655827ef2e268e9ab327e4a6c788c3e336146e0.tar.xz slixmpp-3655827ef2e268e9ab327e4a6c788c3e336146e0.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0095/stream_initiation.py')
0 files changed, 0 insertions, 0 deletions