Merge branch 'release/3.0.4'

terramar-labs · Aug 18, 2015 · a691e40 · a691e40
2 parents 47ddddb + 6484b00
commit a691e40
Show file tree

Hide file tree

Showing 5 changed files with 568 additions and 564 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,9 @@
   "type": "application",
   "require": {
     "php": ">=5.4.0",
-    "nice/framework": "~1.0",
+    "ext-pcntl": "*",
+    "ext-posix": "*",
+    "nice/framework": "~1.1",
     "nice/security": "~1.0",
     "nice/doctrine-orm": "~1.0",
     "nice/twig": "~1.0",
@@ -17,9 +19,8 @@
     "symfony/yaml": "~2.4",
     "composer/satis": "dev-master",
     "composer/composer": "1.0.x-dev",
-    "sami/sami": "dev-master",
-    "m4tthumphrey/php-gitlab-api": "dev-master",
-    "knplabs/github-api": "~1.2"
+    "m4tthumphrey/php-gitlab-api": "~7.13",
+    "knplabs/github-api": "~1.4"
   },
   "require-dev": {
     "phpunit/phpunit": "~3.7"