Merge branch 'master' into develop

hackzilla · hackzilla · commit 45ca91e46c6b · 2016-06-22T19:26:39.000+01:00
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "hackzilla/ticket-bundle",
-    "description": "This Bundle provides ticketing functionality for Symfony2 applications. Multilingual capable",
+    "description": "This Bundle provides multilingual ticketing functionality for Symfony applications.",
     "keywords": [
         "ticket",
         "ticketing",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "hackzilla/ticket-bundle",`
`3`		`- "description": "This Bundle provides ticketing functionality for Symfony2 applications. Multilingual capable",`
	`3`	`+ "description": "This Bundle provides multilingual ticketing functionality for Symfony applications.",`
`4`	`4`	`"keywords": [`
`5`	`5`	`"ticket",`
`6`	`6`	`"ticketing",`