[latex3-commits] [git/LaTeX3-latex3-latex2e] textcomp: Merge branch 'develop' into textcomp (bf670cfa)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : textcomp
Link       : https://github.com/latex3/latex2e/commit/bf670cfa4409253dd803047e6c6d503530b4276d

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

commit bf670cfa4409253dd803047e6c6d503530b4276d
Merge: c9fe87d9 e0081f7f
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Fri Oct 4 14:36:14 2019 +0200

    Merge branch 'develop' into textcomp
    
    # Conflicts:
    #       base/testfiles/github-robust-0123.luatex.tlg
    #       base/testfiles/github-robust-0123.lvt
    #       base/testfiles/github-robust-0123.tlg
    #       base/testfiles/github-robust-0123.xetex.tlg
    
    the above still needs to be resolved


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


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 bf670cfa4409253dd803047e6c6d503530b4276d