diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-09-22 16:13:37 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-09-22 16:13:37 -0300 |
| commit | 30fe51fa5c90a5ec08491b6d3f8524838ec75ac2 (patch) | |
| tree | b58d8435046bc821810e5804aa7f39bb159206aa /docs/conf.py | |
| parent | db044d01432e8c78fcd266308aec0edbee990ab3 (diff) | |
| parent | d62b86224f1f4697c5c2a31d2cb0ad8b789fe1a9 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/bug/python2-compat' into develop
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions