diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-09-22 16:17:02 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-09-22 16:17:02 -0300 |
| commit | c1fa3959fbffb381e067dcd619d528412e235401 (patch) | |
| tree | 72662a8d2102dd782d68006d69e3b3058d8bd899 /docs/conf.py | |
| parent | 30fe51fa5c90a5ec08491b6d3f8524838ec75ac2 (diff) | |
| parent | 668a9f9aa327c3c055b9e0f641f8c33d59e1c452 (diff) | |
Merge remote-tracking branch 'elijah/feature/prefui' into develop
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions