[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Merge branch 'master' into develop (98189d2a)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/98189d2a3dfb3579840267a248efefdd47f6b6c4

>---------------------------------------------------------------

commit 98189d2a3dfb3579840267a248efefdd47f6b6c4
Merge: a9114b83 59323c89
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sat Oct 12 20:16:21 2019 +0200

    Merge branch 'master' into develop
    
    # Conflicts:
    #       base/changes.txt
    #       base/ltvers.dtx


>---------------------------------------------------------------

98189d2a3dfb3579840267a248efefdd47f6b6c4
 base/doc/latexchanges.tex | 7 +++++++
 base/ltvers.dtx           | 2 +-
 base/nfssfont.dtx         | 6 ++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --cc base/ltvers.dtx
index 24838e9c,d15bd784..cb531ae0
--- a/base/ltvers.dtx
+++ b/base/ltvers.dtx
@@@ -112,10 -112,10 +112,10 @@@
  %</2ekernel>
  %<latexrelease>\edef\latexreleaseversion
  %<*2ekernel|latexrelease>
-    {2020-01-01}
 -   {2019-10-01}
++   {2020-02-01}
  %</2ekernel|latexrelease>
  %<*2ekernel>
 -\def\patch at level{1}
 +\def\patch at level{-1}
  %    \end{macrocode}
  %    
  % \begin{macro}{\development at branch@name}