diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-28 16:07:43 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-28 16:07:43 -0300 |
| commit | 6eb36c2bf8090c13dfff67fd1bca94ecd03c5e2b (patch) | |
| tree | 2d42bb469858f942fd88c2c8edafbfb04fa00afc /docs/conf.py | |
| parent | 37363c9700c245623d9c7f50ccbdfe1b9482eafe (diff) | |
| parent | b27fcd2a41fec9c642207488489f0d13cc04f6db (diff) | |
Merge remote-tracking branch 'ivan/bug/hotfix' into develop
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions