diff options
author | jfbu <jfbu@free.fr> | 2018-12-28 12:50:20 +0100 |
---|---|---|
committer | jfbu <jfbu@free.fr> | 2018-12-28 12:50:20 +0100 |
commit | 32d57b8637b89cdbd90da748f7cd7cd0e6d7d9f8 (patch) | |
tree | 6ec66ea9f429f4853e063a47cf4d2cfcd46bc092 /tests/test_build_html5.py | |
parent | 4f37b3342a2497913258d05cde413242bae543d7 (diff) | |
parent | 38c5ec13a54a2b7fcd7e70956ee99a656a651f13 (diff) | |
download | sphinx-git-32d57b8637b89cdbd90da748f7cd7cd0e6d7d9f8.tar.gz |
Merge branch '1.8'
resolved Conflicts:
doc/development/tutorials/todo.rst
sphinx/locale/__init__.py
sphinx/search/zh.py
Diffstat (limited to 'tests/test_build_html5.py')
0 files changed, 0 insertions, 0 deletions