diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-22 13:58:12 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-22 13:58:12 -0700 |
| commit | 12e0e1a16b56f8a4797912ae0ab4c057c07b0b9f (patch) | |
| tree | 73f2c448eeb9acd6b0ee81d47eda78e13ffddf28 /sleekxmpp/features/feature_preapproval | |
| parent | 0d448b82214ed8bed3477db375799ae8399d0393 (diff) | |
| parent | 5e9266ba90a11eb5f20d3f049b34ef296411f225 (diff) | |
| download | slixmpp-12e0e1a16b56f8a4797912ae0ab4c057c07b0b9f.tar.gz slixmpp-12e0e1a16b56f8a4797912ae0ab4c057c07b0b9f.tar.bz2 slixmpp-12e0e1a16b56f8a4797912ae0ab4c057c07b0b9f.tar.xz slixmpp-12e0e1a16b56f8a4797912ae0ab4c057c07b0b9f.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/features/feature_preapproval')
0 files changed, 0 insertions, 0 deletions