summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins/xep_0027/gpg.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-06-13 09:27:47 -0700
committerLance Stout <lancestout@gmail.com>2012-06-13 09:27:47 -0700
commitf89df6e70cee5840dbdbf41e68ae7d2384814373 (patch)
treedff0d3315c117ecba12fdc2837dd3ed6fad01b86 /sleekxmpp/plugins/xep_0027/gpg.py
parent250d28e870b63576e09dd1288b05394808518369 (diff)
parent0e36a0135407ea9a274517c7cfd5fe32eda0491f (diff)
downloadslixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.gz
slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.bz2
slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.xz
slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0027/gpg.py')
0 files changed, 0 insertions, 0 deletions