Merge branch '2.2.0'

MeCapron · Feb 27, 2019 · 61d4214 · 61d4214
2 parents 03c07f0 + 41d29f5
commit 61d4214
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "adexos/language_fr_fr",
   "description": "French (français) Magento2 Language Pack (fr_FR) - From Adexos",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "license": [
     "MIT"
   ],

diff --git a/fr_FR.csv b/fr_FR.csv
@@ -5944,4 +5944,5 @@ Created,Créer...,module,Magento_Sales
 "You haven\'t selected any items!","Vous n\'avez rien selectionné",module,Magento_Downloadable
 "You haven\'t selected any items!","Vous n\'avez rien selectionné",module,Magento_ConfigurableProduct
 "You haven\'t selected any items!","Vous n\'avez rien selectionné",module,Magento_Swatches
-"You haven't selected any items!","Vous n'avez rien selectionné"
+"You haven't selected any items!","Vous n'avez rien selectionné"
+"You haven\'t selected any items!","Vous n\'avez rien selectionné"