diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-24 13:07:19 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-24 13:07:19 -0700 |
| commit | 06a690a2592cba388877391935ed4168d101a231 (patch) | |
| tree | 54d5f70297b425cbb47ebc13415eaccf914c2152 /docs/conf.py | |
| parent | 14c9e9a9cc263a2695cb9d8e5575d60bd0a55197 (diff) | |
| parent | 52feabbe7641f19a17810438d2469b2395b2819f (diff) | |
| download | slixmpp-06a690a2592cba388877391935ed4168d101a231.tar.gz slixmpp-06a690a2592cba388877391935ed4168d101a231.tar.bz2 slixmpp-06a690a2592cba388877391935ed4168d101a231.tar.xz slixmpp-06a690a2592cba388877391935ed4168d101a231.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions