Merge remote-tracking branch 'origin/master' into reserver

chrisboulton · Apr 18, 2017 · a7127af · a7127af
2 parents 092f65e + 968b7e6
commit a7127af
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
 		"php": ">=5.3.0",
 		"ext-pcntl": "*",
 		"colinmollenhour/credis": "~1.7",
-		"psr/log": "1.0.0"
+		"psr/log": "~1.0"
 	},
 	"suggest": {
 		"ext-proctitle": "Allows php-resque to rename the title of UNIX processes to show the status of a worker.",