summaryrefslogtreecommitdiff
path: root/docs/xmpp_tdg.rst
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-12-03 12:42:53 -0800
committerLance Stout <lancestout@gmail.com>2012-12-03 12:42:53 -0800
commit6f8a4f83549ab1716ddca55c05518f3867eb9213 (patch)
tree5238571e13e5e5e6cec6db990ea1523cdcd47197 /docs/xmpp_tdg.rst
parente25a49f80444ff36ba1ee91059b4c3d74644d6ff (diff)
parentdef34f0e4296bbba18c243a1ca34c7893763718b (diff)
downloadslixmpp-6f8a4f83549ab1716ddca55c05518f3867eb9213.tar.gz
slixmpp-6f8a4f83549ab1716ddca55c05518f3867eb9213.tar.bz2
slixmpp-6f8a4f83549ab1716ddca55c05518f3867eb9213.tar.xz
slixmpp-6f8a4f83549ab1716ddca55c05518f3867eb9213.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs/xmpp_tdg.rst')
0 files changed, 0 insertions, 0 deletions