Merge branch 'master' into feature/te-751/master-enabling-step-3

spryker · Jan 24, 2019 · 14abdbd · 14abdbd
2 parents 92cde2c + 4e4cd1c
commit 14abdbd
Show file tree

Hide file tree

Showing 4 changed files with 580 additions and 201 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/data/import/glossary.csv b/data/import/glossary.csv
@@ -202,7 +202,7 @@ catalog.sort.price_asc,Sort by price ascending,en_US
 catalog.sort.price_desc,Nach Preis absteigend sortieren,de_DE
 catalog.sort.price_desc,Sort by price descending,en_US
 catalog.sort.rating,Sort by product ratings,en_US
-caralot.sort.rating,Nach Produktbewertungen sortieren,de_DE
+catalog.sort.rating,Nach Produktbewertungen sortieren,de_DE
 catalog.filter.activeFilters,Aktive Filter,de_DE
 catalog.filter.activeFilters,Active filters,en_US
 catalog.filter.resetAllFilters,Alle Filter zurücksetzen,de_DE