-
Jonny Bradley authored
Manual resolution of conflicts: lang/fr/language.php replaced with version from 6.x lib/language/Language.php manually merged - sampaioprimo please check
8fee4abc
Manual resolution of conflicts: lang/fr/language.php replaced with version from 6.x lib/language/Language.php manually merged - sampaioprimo please check