Merge branch '2.2.1' into 2.0

Resolved Conflicts:
	CHANGES
	sphinx/__init__.py
	sphinx/texinputs/sphinx.sty
This commit is contained in:
jfbu
2019-09-14 15:25:44 +02:00
2 changed files with 25 additions and 1 deletions

23
CHANGES
View File

@@ -28,6 +28,29 @@ Bugs fixed
Testing
--------
Release 2.2.1 (in development)
==============================
Dependencies
------------
Incompatible changes
--------------------
Deprecated
----------
Features added
--------------
Bugs fixed
----------
* #6641: LaTeX: Undefined control sequence ``\sphinxmaketitle``
Testing
--------
Release 2.2.0 (released Aug 19, 2019)
=====================================