Merge branch 'master' of git://github.com/vivait/StringGeneratorBundle

Robin Cawser · Robin Cawser · commit 38dd1842fb45 · 2014-12-04T10:34:04.000Z
diff --git a/composer.json b/composer.json
@@ -1,5 +1,6 @@
 {  
     "name":"vivait/string-generator-bundle",
+    "license": "MIT",
     "description":"Generate random strings for IDs or keys using property annotations",
     "authors":[
       {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name":"vivait/string-generator-bundle",`
	`3`	`+ "license": "MIT",`
`3`	`4`	`"description":"Generate random strings for IDs or keys using property annotations",`
`4`	`5`	`"authors":[`
`5`	`6`	`{`