delta/python-packages/sphinx-git.git/sphinx/texinputs/sphinxpackagefootnote.sty, branch 9864_mathjax_loading_method

Merge branch '3.x' into merge_3.x_into_master

2021-02-09T18:03:38+00:00

Resolved Conflicts:
	sphinx/texinputs/sphinx.sty

Some hunks needed to go to sphinx/texinputs/sphinxlatexliterals.py,
others already belonged to split files.

Merge branch '3.x' into merge_3.x_into_master

2021-02-04T15:31:45+00:00

Resolved Conflicts:
	sphinx/texinputs/sphinxpackagefootnote.sty

Merge branch '3.x' into master_with_merged_3.x

2021-02-02T17:01:55+00:00

LaTeX: document what the style files provide and require

2021-01-31T12:58:00+00:00

Refactor LaTeX [4/2]: suppress extra bracket from bad latex merge :(

2021-01-27T16:35:35+00:00

Merge branch 'master' into refactor_latex_into_multiple_files

2021-01-27T16:02:00+00:00

Refactor LaTeX [2/2]: renamings of auxiliary Sphinx LaTeX packages

2021-01-27T15:22:23+00:00

sphinxcyrillic -> sphinxpackagecyrillic
sphinxmulticell -> sphinxpackagemulticell
footnotehyper-sphinx -> sphinxpackagefootnote