Merge branch 'webimpress-fix-athletic-require-dev'

zendframework · Oct 6, 2015 · a03de81 · a03de81
2 parents a6c747f + 9f36712
commit a03de81
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -14,8 +14,7 @@
     },
     "require": {
         "php": ">=5.5",
-        "zendframework/zend-stdlib": "~2.5",
-        "athletic/athletic": "dev-master"
+        "zendframework/zend-stdlib": "~2.5"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -33,6 +32,7 @@
     },
     "require-dev": {
         "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "~4.0"
+        "phpunit/PHPUnit": "~4.0",
+        "athletic/athletic": "dev-master"
     }
 }