From: Emma Marichal Date: Wed, 9 Apr 2025 11:53:49 +0000 (+0200) Subject: Merge branch 'gftools_packager_ofl_figtree' of github.com:google/fonts into gftools_p... X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9328%2Fhead;p=thirdparty%2Fgoogle%2Ffonts.git Merge branch 'gftools_packager_ofl_figtree' of github.com:google/fonts into gftools_packager_ofl_figtree # Conflicts: # ofl/figtree/Figtree-Italic[wght].ttf # ofl/figtree/Figtree[wght].ttf # ofl/figtree/article/image2.png # ofl/figtree/article/image4.png --- 2003bdb9f40d2ad09cc3fc503a054058c7a30ee7