diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-01-18 15:36:18 -0800 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-01-18 15:36:18 -0800 |
| commit | bb3080e829df126466c44cb2f89a0307e5c4146a (patch) | |
| tree | 6cacc94dcc612d570b5010f925eb209ca9eec1e8 /docs/getting_started/iq.rst | |
| parent | fd515d807c9af22b2df5cbe31825bf26aad596c1 (diff) | |
| parent | bd85e9539850f691f39994ade126ccd73371f61d (diff) | |
| download | slixmpp-bb3080e829df126466c44cb2f89a0307e5c4146a.tar.gz slixmpp-bb3080e829df126466c44cb2f89a0307e5c4146a.tar.bz2 slixmpp-bb3080e829df126466c44cb2f89a0307e5c4146a.tar.xz slixmpp-bb3080e829df126466c44cb2f89a0307e5c4146a.zip | |
Merge branch 'docs' into develop
Conflicts:
docs/index.rst
Diffstat (limited to 'docs/getting_started/iq.rst')
0 files changed, 0 insertions, 0 deletions