summaryrefslogtreecommitdiff
path: root/docs/conf.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-11-09 09:58:51 -0800
committerLance Stout <lancestout@gmail.com>2012-11-09 09:58:51 -0800
commit2d066c34fd58882901fea0d82c34ad37e312cd27 (patch)
tree49cdd208e61379d984357e9e8340d9344525ab4d /docs/conf.py
parent1b449585f7bd490c2b788ef962fece5c0ae7226b (diff)
parent7a1ed64985a7cbfe48e834838d30e202f1c692e4 (diff)
downloadslixmpp-2d066c34fd58882901fea0d82c34ad37e312cd27.tar.gz
slixmpp-2d066c34fd58882901fea0d82c34ad37e312cd27.tar.bz2
slixmpp-2d066c34fd58882901fea0d82c34ad37e312cd27.tar.xz
slixmpp-2d066c34fd58882901fea0d82c34ad37e312cd27.zip
Merge branch 'master' into develop
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions