diff options
author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-06 13:32:41 -0300 |
---|---|---|
committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-09-06 13:32:41 -0300 |
commit | 5c155f8c02ae7e5b09e84b853aa80ccbf8d872c4 (patch) | |
tree | 76f9bed0c96292aac35325d96b4ae2b9705e2e99 /docs/conf.py | |
parent | 8429d35de46942dc86be2644df84d785f3b4c48f (diff) | |
parent | 869989b3ce7e1aee3f70fbced91d3c76cd27045a (diff) |
Merge remote-tracking branch 'kali/feature/update-docs-to-0.3.2' into develop
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions