diff options
| author | jfbu <jfbu@free.fr> | 2019-09-14 15:25:44 +0200 |
|---|---|---|
| committer | jfbu <jfbu@free.fr> | 2019-09-14 15:25:44 +0200 |
| commit | e8963e84ed593461825a4fbcc7077b4f53a65e04 (patch) | |
| tree | 66a167c2c218e972960f9ad9061bc6dc5e27c4e2 /sphinx/io.py | |
| parent | e944a555170f8320adc3768799fb13bc55fda472 (diff) | |
| parent | 59890a3b6df3b1e9c91c69a60c7df0cf48e3722a (diff) | |
| download | sphinx-git-e8963e84ed593461825a4fbcc7077b4f53a65e04.tar.gz | |
Merge branch '2.2.1' into 2.0
Resolved Conflicts:
CHANGES
sphinx/__init__.py
sphinx/texinputs/sphinx.sty
Diffstat (limited to 'sphinx/io.py')
0 files changed, 0 insertions, 0 deletions