diff options
| author | jfbu <jfbu@free.fr> | 2021-02-09 18:51:40 +0100 |
|---|---|---|
| committer | jfbu <jfbu@free.fr> | 2021-02-09 19:03:38 +0100 |
| commit | b9c53c8ca61d642ee0339f13c0c67134d35f19a8 (patch) | |
| tree | b6f92bd67af01f45990ce1c79c67b75768b24ac0 /doc/development/tutorials/examples/autodoc_intenum.py | |
| parent | 66aa22f1ea9ef79034812c801432ba152ad96b41 (diff) | |
| parent | 15209223ac105820c1057398e15b42b90307cdfd (diff) | |
| download | sphinx-git-b9c53c8ca61d642ee0339f13c0c67134d35f19a8.tar.gz | |
Merge branch '3.x' into merge_3.x_into_master
Resolved Conflicts:
sphinx/texinputs/sphinx.sty
Some hunks needed to go to sphinx/texinputs/sphinxlatexliterals.py,
others already belonged to split files.
Diffstat (limited to 'doc/development/tutorials/examples/autodoc_intenum.py')
0 files changed, 0 insertions, 0 deletions