From: Chris Simpkins Date: Wed, 7 Dec 2022 00:09:18 +0000 (-0500) Subject: Merge commit '4c9db329d9303a64b0cd7a3d40be24d2b5e667fa' into chrissimpkins-update... X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5677%2Fhead;p=thirdparty%2Fgoogle%2Ffonts.git Merge commit '4c9db329d9303a64b0cd7a3d40be24d2b5e667fa' into chrissimpkins-update-axisregistry --- 8886f74a902cc1dfddd11b92642c24a10212961d diff --cc axisregistry/.github/ISSUE_TEMPLATE/1_add-axis.md index 0000000000,d51de94299..d51de94299 mode 000000,100644..100644 --- a/axisregistry/.github/ISSUE_TEMPLATE/1_add-axis.md +++ b/axisregistry/.github/ISSUE_TEMPLATE/1_add-axis.md diff --cc axisregistry/.github/ISSUE_TEMPLATE/2_anything-else.md index 0000000000,3daeb46349..3daeb46349 mode 000000,100644..100644 --- a/axisregistry/.github/ISSUE_TEMPLATE/2_anything-else.md +++ b/axisregistry/.github/ISSUE_TEMPLATE/2_anything-else.md diff --cc axisregistry/Lib/axisregistry/data/bounce.textproto index 0000000000,f78f6ceb5c..f78f6ceb5c mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/bounce.textproto +++ b/axisregistry/Lib/axisregistry/data/bounce.textproto diff --cc axisregistry/Lib/axisregistry/data/informality.textproto index 0000000000,bc819de7a8..bc819de7a8 mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/informality.textproto +++ b/axisregistry/Lib/axisregistry/data/informality.textproto diff --cc axisregistry/Lib/axisregistry/data/spacing.textproto index 0000000000,979b70173b..979b70173b mode 000000,100644..100644 --- a/axisregistry/Lib/axisregistry/data/spacing.textproto +++ b/axisregistry/Lib/axisregistry/data/spacing.textproto