[latex3-commits] [git/LaTeX3-latex3-latex2e] master: Merge commit '8065dfc7eafa6d55e6c85d33a744698c818037d5' (79c676c2)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : master
Link       : https://github.com/latex3/latex2e/commit/79c676c2b3e874371cb4ba09b15be96e7fc5982a

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

commit 79c676c2b3e874371cb4ba09b15be96e7fc5982a
Merge: 872643a4 8065dfc7
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sun Oct 25 09:45:13 2020 +0100

    Merge commit '8065dfc7eafa6d55e6c85d33a744698c818037d5'
    
    # Conflicts:
    #       base/lthooks.dtx


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

79c676c2b3e874371cb4ba09b15be96e7fc5982a
 base/lthooks.dtx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)