Merge branch 'master' into lang_update_276_1616099300
commitc5d40bb7df848e3ac5a53ae64dc815bbfee46987
authorHenry Pan <git@phy25.com>
Mon, 22 Mar 2021 02:35:47 +0000 (21 22:35 -0400)
committerGitHub <noreply@github.com>
Mon, 22 Mar 2021 02:35:47 +0000 (21 22:35 -0400)
treebb825bc499c703b561d39e05d2c67d478128eaaa
parent72a969d4088c5961d537b98111a8957b9abfe1aa
parent9dcf627417bc9975e5a7bcdcb273f504dc9dbe71
Merge branch 'master' into lang_update_276_1616099300
inc/lang/fr/lang.php
lib/plugins/config/lang/fr/lang.php