summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/google_settings/stanza.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2014-04-20 18:10:22 -0700
committerLance Stout <lancestout@gmail.com>2014-04-20 18:10:22 -0700
commitef2f5d29788218f679cd878e4e25bbd61545fef4 (patch)
treee65f1cd10ddc618101c21acfe264f74037fb6450 /sleekxmpp/plugins/google_settings/stanza.py
parent62671e0f56c0c24bb33b99377011267b8769387b (diff)
parent93869f77a076eda03a9719e9b854dfc9d0597264 (diff)
downloadslixmpp-1.2.5.tar.gz
slixmpp-1.2.5.tar.bz2
slixmpp-1.2.5.tar.xz
slixmpp-1.2.5.zip
Merge branch 'develop' of github.com:fritzy/SleekXMPP into developsleek-1.2.51.2.5
Diffstat (limited to 'sleekxmpp/plugins/google_settings/stanza.py')
0 files changed, 0 insertions, 0 deletions