Merge remote-tracking branch 'origin/master'

neoshadybeat · neoshadybeat · commit bcd16064c3aa · 2013-12-28T18:17:23.000+01:00
diff --git a/composer.json b/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "avocode/form-extensions-bundle",
     "type": "symfony-bundle",
+    "description": "Add additional form types to symfony2",
     "license": "MIT and Apache-2.0",
     "authors": [
         {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "avocode/form-extensions-bundle",`
`3`	`3`	`"type": "symfony-bundle",`
	`4`	`+ "description": "Add additional form types to symfony2",`
`4`	`5`	`"license": "MIT and Apache-2.0",`
`5`	`6`	`"authors": [`
`6`	`7`	`{`