From: Simon Cozens Date: Tue, 1 Nov 2022 10:55:51 +0000 (+0000) Subject: Merge commit 'fc503d13ee4b4ca4891998c301a0d7c9bec5dfd6' into merge-lang-updates X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F5489%2Fhead;p=thirdparty%2Fgoogle%2Ffonts.git Merge commit 'fc503d13ee4b4ca4891998c301a0d7c9bec5dfd6' into merge-lang-updates --- 135ca1e7c7d805bee9c3231a9e53c3c21ac7e27a diff --cc lang/Lib/gflanguages/data/languages/nst_Tnsa.textproto index 0000000000,53afc6bcd0..53afc6bcd0 mode 000000,100644..100644 --- a/lang/Lib/gflanguages/data/languages/nst_Tnsa.textproto +++ b/lang/Lib/gflanguages/data/languages/nst_Tnsa.textproto diff --cc lang/Lib/gflanguages/data/languages/txo_Toto.textproto index 0000000000,a31c033d90..a31c033d90 mode 000000,100644..100644 --- a/lang/Lib/gflanguages/data/languages/txo_Toto.textproto +++ b/lang/Lib/gflanguages/data/languages/txo_Toto.textproto diff --cc lang/Lib/gflanguages/data/scripts/Tnsa.textproto index 0000000000,6226fdc89c..6226fdc89c mode 000000,100644..100644 --- a/lang/Lib/gflanguages/data/scripts/Tnsa.textproto +++ b/lang/Lib/gflanguages/data/scripts/Tnsa.textproto diff --cc lang/Lib/gflanguages/data/scripts/Toto.textproto index 0000000000,bdd969380b..bdd969380b mode 000000,100644..100644 --- a/lang/Lib/gflanguages/data/scripts/Toto.textproto +++ b/lang/Lib/gflanguages/data/scripts/Toto.textproto diff --cc lang/dev-requirements.txt index 0000000000,9acb19bea6..9acb19bea6 mode 000000,100644..100644 --- a/lang/dev-requirements.txt +++ b/lang/dev-requirements.txt diff --cc lang/snippets/fix-exemplars-duplicates.py index 0000000000,fdc0f6a4ad..fdc0f6a4ad mode 000000,100644..100644 --- a/lang/snippets/fix-exemplars-duplicates.py +++ b/lang/snippets/fix-exemplars-duplicates.py diff --cc lang/tests/test_data_languages.py index 0000000000,0a244af7ef..0a244af7ef mode 000000,100644..100644 --- a/lang/tests/test_data_languages.py +++ b/lang/tests/test_data_languages.py diff --cc lang/tests/test_dottedcircle.py index 0000000000,b3e3603296..b3e3603296 mode 000000,100644..100644 --- a/lang/tests/test_dottedcircle.py +++ b/lang/tests/test_dottedcircle.py