diff options
| author | Lance Stout <lancestout@gmail.com> | 2013-05-11 12:48:47 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2013-05-11 12:48:47 -0700 |
| commit | 2e9ccd0623d253fbb3ddd2e3b8e8908cd349246d (patch) | |
| tree | 6918a901d241e36d239ab7afb35e07eafc3227aa /sleekxmpp/plugins/google/settings/stanza.py | |
| parent | 7b49c82210d6b27b18dffe36e6533024b8bee913 (diff) | |
| parent | fae39e1ab4e516c7c7b6cef81188359e38fe0531 (diff) | |
| download | slixmpp-2e9ccd0623d253fbb3ddd2e3b8e8908cd349246d.tar.gz slixmpp-2e9ccd0623d253fbb3ddd2e3b8e8908cd349246d.tar.bz2 slixmpp-2e9ccd0623d253fbb3ddd2e3b8e8908cd349246d.tar.xz slixmpp-2e9ccd0623d253fbb3ddd2e3b8e8908cd349246d.zip | |
Merge branch 'si_file_transfer' into develop
Diffstat (limited to 'sleekxmpp/plugins/google/settings/stanza.py')
0 files changed, 0 insertions, 0 deletions