diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2015-10-01 11:03:09 +0200 |
|---|---|---|
| committer | Morgan Richomme <morgan.richomme@orange.com> | 2015-10-01 11:03:09 +0200 |
| commit | 19c7d0ecfd453d5e631466401e454d4da3314f9b (patch) | |
| tree | c1dac5451af1760f963d709772b5062ba2741983 /docs/conf.py | |
| parent | 5901dd9a47b08c162acb631bf5acaeeb1b7ce745 (diff) | |
| parent | 96bf9abe9b1b26a79dcc86900e8eb33d8544e773 (diff) | |
Merge branch 'master' into stable/arnoarno.2015.2.0
Diffstat (limited to 'docs/conf.py')
0 files changed, 0 insertions, 0 deletions