diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-11-27 19:57:48 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-11-27 19:57:48 -0500 |
| commit | e25a49f80444ff36ba1ee91059b4c3d74644d6ff (patch) | |
| tree | 46f2acdaef728c25bbe65eb220a35d11fdffa531 /docs/conf.py | |
| parent | 2d066c34fd58882901fea0d82c34ad37e312cd27 (diff) | |
| parent | b820351f6468e6718dc75b69a0088b2433a658af (diff) | |
| download | slixmpp-e25a49f80444ff36ba1ee91059b4c3d74644d6ff.tar.gz slixmpp-e25a49f80444ff36ba1ee91059b4c3d74644d6ff.tar.bz2 slixmpp-e25a49f80444ff36ba1ee91059b4c3d74644d6ff.tar.xz slixmpp-e25a49f80444ff36ba1ee91059b4c3d74644d6ff.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions