diff options
author | bear (Mike Taylor) <bear@andyet.net> | 2015-04-11 20:42:33 -0400 |
---|---|---|
committer | bear (Mike Taylor) <bear@andyet.net> | 2015-04-11 20:42:33 -0400 |
commit | 93894247a46f187a08e69fba6a68d26e382bc777 (patch) | |
tree | a3bbbde70768a1265ed95d23ecca2a67e2014b46 /docs/getting_started/proxy.rst | |
parent | 16bb5e2537d0bffe4c561fa97be8adb12110d41f (diff) | |
parent | ef1c4368d0b18c55609a75f6494037e2baecc0b3 (diff) | |
download | slixmpp-93894247a46f187a08e69fba6a68d26e382bc777.tar.gz slixmpp-93894247a46f187a08e69fba6a68d26e382bc777.tar.bz2 slixmpp-93894247a46f187a08e69fba6a68d26e382bc777.tar.xz slixmpp-93894247a46f187a08e69fba6a68d26e382bc777.zip |
Merge branch 'develop' of https://github.com/hildjj/SleekXMPP into hildjj-develop
Diffstat (limited to 'docs/getting_started/proxy.rst')
0 files changed, 0 insertions, 0 deletions