Merge branch '1.2.x'

jobcloud · Aug 14, 2016 · bf6d0b2 · bf6d0b2
2 parents f204d9b + 4f636ad
commit bf6d0b2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "zendframework/zend-barcode": "^2.0",
         "zendframework/zend-validator": "^2.0",
         "imagine/Imagine": ">=0.2.0,<0.6.0",
-        "phpunit/phpunit": ">=4,<6.0.0"
+        "phpunit/phpunit": ">=4,<5.4.0"
     },
     "suggest": {
     	"zendframework/zend-barcode":  "If you want to use barcodes",