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

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : develop+master
Link       : https://github.com/latex3/latex2e/commit/c808b5bb7397a8e0509a5ba9e3dff6d09d383b15

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

commit c808b5bb7397a8e0509a5ba9e3dff6d09d383b15
Merge: fb7f60f9 6bfe1a90
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Jan 7 18:49:33 2021 +0100

    Merge branch 'develop' into develop+master
    
    # Conflicts:
    #       base/testfiles-lthooks/lthooks-000.tlg
    #       base/testfiles-lthooks/lthooks-001.tlg
    #       base/testfiles-lthooks/lthooks-002.tlg
    #       base/testfiles-lthooks/lthooks-003.tlg
    #       base/testfiles-lthooks/lthooks-004.tlg
    #       base/testfiles-lthooks/lthooks-005.tlg
    #       base/testfiles-lthooks/lthooks-006.tlg
    #       base/testfiles-lthooks/lthooks-007.tlg
    #       base/testfiles-lthooks/lthooks-008.tlg
    #       base/testfiles-lthooks/lthooks-009.tlg
    #       base/testfiles-lthooks/lthooks-011.tlg
    #       base/testfiles-lthooks/lthooks-013.tlg
    #       base/testfiles-lthooks/lthooks-021.tlg
    #       base/testfiles-lthooks/lthooks-legacy.tlg
    #       base/testfiles-lthooks2/lthooks2-002.tlg
    #       base/testfiles-lthooks2/lthooks2-005.tlg
    #       base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
    #       base/testfiles/tlb-latexrelease-rollback-003-often.tlg
    #       base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
    #       base/testfiles/tlb-rollback-004-often.luatex.tlg
    #       base/testfiles/tlb-rollback-004-often.tlg
    #       base/testfiles/tlb-rollback-004-often.xetex.tlg
    #       required/firstaid/changes.txt
    #       required/firstaid/latex2e-first-aid-for-external-files.dtx
    #       required/firstaid/testfiles-TU/firstaid-bidi.luatex.tlg
    #       required/firstaid/testfiles-TU/firstaid-bidi.tlg


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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --textconv --cc c808b5bb7397a8e0509a5ba9e3dff6d09d383b15