]> git.ipfire.org Git - thirdparty/google/fonts.git/commitdiff
projects / thirdparty / google / fonts.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbb14ea 8228893)
Merge branch 'gftools_packager_ofl_figtree' of github.com:google/fonts into gftools_p... 9328/head
authorEmma Marichal <bonjour@emmamarichal.fr>
Wed, 9 Apr 2025 11:53:49 +0000 (13:53 +0200)
committerEmma Marichal <bonjour@emmamarichal.fr>
Wed, 9 Apr 2025 11:53:49 +0000 (13:53 +0200)
# Conflicts:
# ofl/figtree/Figtree-Italic[wght].ttf
# ofl/figtree/Figtree[wght].ttf
# ofl/figtree/article/image2.png
# ofl/figtree/article/image4.png


Trivial merge
Mirror of https://github.com/google/fonts.git