summaryrefslogtreecommitdiff
path: root/docs/api/basexmpp.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-11-27 19:57:48 -0500
committerLance Stout <lancestout@gmail.com>2012-11-27 19:57:48 -0500
commite25a49f80444ff36ba1ee91059b4c3d74644d6ff (patch)
tree46f2acdaef728c25bbe65eb220a35d11fdffa531 /docs/api/basexmpp.rst
parent2d066c34fd58882901fea0d82c34ad37e312cd27 (diff)
parentb820351f6468e6718dc75b69a0088b2433a658af (diff)
downloadslixmpp-e25a49f80444ff36ba1ee91059b4c3d74644d6ff.tar.gz
slixmpp-e25a49f80444ff36ba1ee91059b4c3d74644d6ff.tar.bz2
slixmpp-e25a49f80444ff36ba1ee91059b4c3d74644d6ff.tar.xz
slixmpp-e25a49f80444ff36ba1ee91059b4c3d74644d6ff.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs/api/basexmpp.rst')
0 files changed, 0 insertions, 0 deletions