diff options
| author | jfbu <jfbu@free.fr> | 2018-12-17 15:15:02 +0100 |
|---|---|---|
| committer | jfbu <jfbu@free.fr> | 2018-12-17 15:23:00 +0100 |
| commit | cce4ad7f801057bf838d2b7f24b6a91b5fa29c06 (patch) | |
| tree | 73db36c1b0176ae513a6cb7e60a07245c653f0ef /sphinx/directives/code.py | |
| parent | 0a199c08b834e8416ddec7d2b4b4f6e8950f8196 (diff) | |
| parent | e9c87b3d13c192a9b6a82d9ce0c6572f85e85743 (diff) | |
| download | sphinx-git-cce4ad7f801057bf838d2b7f24b6a91b5fa29c06.tar.gz | |
Merge branch '1.8'
(Resolved) Conflicts:
sphinx/domains/cpp.py
Diffstat (limited to 'sphinx/directives/code.py')
0 files changed, 0 insertions, 0 deletions