summaryrefslogtreecommitdiff
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-06-22 14:35:20 -0700
committerLance Stout <lancestout@gmail.com>2013-06-22 14:35:20 -0700
commite76a48393159592e73421541ed05e78c287faf00 (patch)
tree4875c5a9d3e2df57f79b8e3800470ce315a8c1e7 /docs/glossary.rst
parentc0437d2de86f5b6ffce17061fc3aed0e35441fd3 (diff)
parent37a804320204726480732704036fad9c7f6fff78 (diff)
downloadslixmpp-e76a48393159592e73421541ed05e78c287faf00.tar.gz
slixmpp-e76a48393159592e73421541ed05e78c287faf00.tar.bz2
slixmpp-e76a48393159592e73421541ed05e78c287faf00.tar.xz
slixmpp-e76a48393159592e73421541ed05e78c287faf00.zip
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
Diffstat (limited to 'docs/glossary.rst')
0 files changed, 0 insertions, 0 deletions