diff options
| author | jfbu <jfbu@free.fr> | 2021-02-04 16:31:45 +0100 |
|---|---|---|
| committer | jfbu <jfbu@free.fr> | 2021-02-04 16:31:45 +0100 |
| commit | 87fa272763f9d19b5fa51038b2b5e4a58773de21 (patch) | |
| tree | a7c32ac0bb0c7c415f8c1c6573d866d324acc2b6 /doc/conf.py | |
| parent | 307a0e580fffa92ece92f08dc1be3a7db4a90dd1 (diff) | |
| parent | ec5b169312399b700298ab95d860a1e217872832 (diff) | |
| download | sphinx-git-87fa272763f9d19b5fa51038b2b5e4a58773de21.tar.gz | |
Merge branch '3.x' into merge_3.x_into_master
Resolved Conflicts:
sphinx/texinputs/sphinxpackagefootnote.sty
Diffstat (limited to 'doc/conf.py')
0 files changed, 0 insertions, 0 deletions