summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-01-18 15:34:12 -0800
committerLance Stout <lancestout@gmail.com>2012-01-18 15:34:12 -0800
commit22cc194ed878ac00715951605dcdee51eb313f1b (patch)
tree0a9caa7ff32a45a3d83b4a5463659e7bc00435b7 /docs
parent79b71228c1659f4127f4c151859f8a8c22838147 (diff)
parent3575084640fb5f17d70d6d691faf6fdd2f090ee7 (diff)
downloadslixmpp-22cc194ed878ac00715951605dcdee51eb313f1b.tar.gz
slixmpp-22cc194ed878ac00715951605dcdee51eb313f1b.tar.bz2
slixmpp-22cc194ed878ac00715951605dcdee51eb313f1b.tar.xz
slixmpp-22cc194ed878ac00715951605dcdee51eb313f1b.zip
Merge branch 'docs' of github.com:fritzy/SleekXMPP into docs
Conflicts: docs/index.rst
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions