diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-05-16 11:53:02 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-05-16 11:53:02 -0300 |
| commit | f995ff502089bcb7ef6a0fe71c692ee7274d45cb (patch) | |
| tree | 6fad439ebef879fa4bd3a9f712700740068f1a50 /docs/conf.py | |
| parent | 6175a790a31b4f987fe18cd6d046f2f53676b565 (diff) | |
| parent | 4fe002c4a02d793964f99c62037c636ab0c64565 (diff) | |
Merge remote-tracking branch 'refs/remotes/irregulator/feature/5672' into develop
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions