Merge branch 'master' of git://github.com/kentr/php-pm-drupal into kentr-add-drupal-bridge

Kent Richards · Kent Richards · commit 2a9cdcc0db81 · 2016-02-01T20:56:08.000-08:00
diff --git a/composer.json b/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "kentr/php-pm-drupal-adapter",
     "require": {
+        "php-pm/php-pm": "*",
         "php-pm/httpkernel-adapter": "*"
     },
     "autoload": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "kentr/php-pm-drupal-adapter",`
`3`	`3`	`"require": {`
	`4`	`+ "php-pm/php-pm": "*",`
`4`	`5`	`"php-pm/httpkernel-adapter": "*"`
`5`	`6`	`},`
`6`	`7`	`"autoload": {`