Merge branch 'master' of github.com:thelia-modules/Keyword

mespeche · mespeche · commit 9ea28eae13b6 · 2015-02-02T11:14:17.000+01:00
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "thelia/keyword",
+    "name": "thelia/keyword-module",
     "type": "thelia-module",
     "license": "LGPL V3",
     "description": "Associate contents, folders, categories and products to one or more keywords",
@@ -16,4 +16,4 @@
     "extra": {
         "installer-name": "Keyword"
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "thelia/keyword",`
	`2`	`+ "name": "thelia/keyword-module",`
`3`	`3`	`"type": "thelia-module",`
`4`	`4`	`"license": "LGPL V3",`
`5`	`5`	`"description": "Associate contents, folders, categories and products to one or more keywords",`
`@@ -16,4 +16,4 @@`
`16`	`16`	`"extra": {`
`17`	`17`	`"installer-name": "Keyword"`
`18`	`18`	`}`
`19`		`-}`
	`19`	`+}`