diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-12-29 15:17:34 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-12-29 15:17:34 -0800 |
| commit | 0998429b07cfc23564847237b5873819a65e531c (patch) | |
| tree | 41729d029652e925251b0bbc47023062b3e0dcc3 /sleekxmpp/plugins/xep_0054/vcard_temp.py | |
| parent | 9ae3a7dbff6f0828a41b003cf0e9efadc14fc1c7 (diff) | |
| parent | 597eb1779c497ad850fe3c03fd480fea5c9ef7ea (diff) | |
| download | slixmpp-0998429b07cfc23564847237b5873819a65e531c.tar.gz slixmpp-0998429b07cfc23564847237b5873819a65e531c.tar.bz2 slixmpp-0998429b07cfc23564847237b5873819a65e531c.tar.xz slixmpp-0998429b07cfc23564847237b5873819a65e531c.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins/xep_0054/vcard_temp.py')
0 files changed, 0 insertions, 0 deletions