summaryrefslogtreecommitdiff
path: root/docs/getting_started/proxy.rst
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2015-10-02 19:07:45 +0200
committermathieui <mathieui@mathieui.net>2015-10-02 19:07:45 +0200
commitada9444bf84bd238238c4d22561f69184dd22cdd (patch)
treeceb4f86446b4129ec22cb348f1cb1bd7a151e2da /docs/getting_started/proxy.rst
parent1100ff1febf7e605e03fd9565bdac5fdaa3bf1e0 (diff)
parentacc52fd935b7e74919ad748f3a630596f66c62af (diff)
downloadslixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.tar.gz
slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.tar.bz2
slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.tar.xz
slixmpp-ada9444bf84bd238238c4d22561f69184dd22cdd.zip
Merge branch 'sleek-merge'
Diffstat (limited to 'docs/getting_started/proxy.rst')
0 files changed, 0 insertions, 0 deletions