summaryrefslogtreecommitdiff
path: root/docs/xeps.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-12-31 02:16:08 -0500
committerLance Stout <lancestout@gmail.com>2011-12-31 02:16:08 -0500
commit9a5e2ae7686a2dad72f2aea2592ab002111003da (patch)
tree0025aa4f8ef2387e6a3aa5609054a4143099b43c /docs/xeps.rst
parente0545bf0bc06893ca905b2a3ebb4d09c76c24f0c (diff)
parentf9cd051209e765c338d3c0e7ed4b3638e89b4a01 (diff)
downloadslixmpp-9a5e2ae7686a2dad72f2aea2592ab002111003da.tar.gz
slixmpp-9a5e2ae7686a2dad72f2aea2592ab002111003da.tar.bz2
slixmpp-9a5e2ae7686a2dad72f2aea2592ab002111003da.tar.xz
slixmpp-9a5e2ae7686a2dad72f2aea2592ab002111003da.zip
Merge branch 'develop' into develop-1.1
Diffstat (limited to 'docs/xeps.rst')
0 files changed, 0 insertions, 0 deletions