diff options
| author | jfbu <jfbu@free.fr> | 2016-09-07 22:33:03 +0200 |
|---|---|---|
| committer | jfbu <jfbu@free.fr> | 2016-09-07 23:18:09 +0200 |
| commit | 1d7c82b3bb4127ab48c96c41321608ccfb0241ef (patch) | |
| tree | b459041211506aad0ccc25f3e325d13554edbd2f /sphinx/addnodes.py | |
| parent | 6432c129d3f1d528fb1b43b79872c7ecfa884134 (diff) | |
| parent | 3eb56b1c6f164ec4557913c17cb720d2e17c33a6 (diff) | |
| download | sphinx-git-1d7c82b3bb4127ab48c96c41321608ccfb0241ef.tar.gz | |
Merge branch 'stable' into master
Conflicts (fixed)::
sphinx/texinputs/sphinx.sty
Diffstat (limited to 'sphinx/addnodes.py')
0 files changed, 0 insertions, 0 deletions