Merge branch '1.7.x'

This commit is contained in:
Alexey Sokolov
2019-07-05 20:10:32 +01:00
515 changed files with 6316 additions and 1 deletions
+4
View File
@@ -8,7 +8,11 @@ msgstr ""
"X-Crowdin-Language: fr\n"
"X-Crowdin-File: /master/modules/po/modpython.pot\n"
"Project-Id-Version: znc-bouncer\n"
<<<<<<< HEAD
"Last-Translator: Various people\n"
=======
"Last-Translator: DarthGandalf\n"
>>>>>>> 1.7.x
"Language-Team: French\n"
"Language: fr_FR\n"