Merge remote-tracking branch 'origin/master'

WyriHaximus · Aug 9, 2015 · c9d8bd1 · c9d8bd1
2 parents 15f55b0 + 3262f8a
commit c9d8bd1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -39,6 +39,7 @@ before_script:
   - if [ -z "$dependencies" ]; then composer install; fi;
   - if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest -n; fi;
   - if [ "$dependencies" = "highest" ]; then composer update -n; fi;
+  - composer show -i
 
 ## Run the actual test
 script: make travis

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -4,7 +4,7 @@ Pull requests are highly appreciated. Here's a quick guide.
 
 Fork, then clone the repo:
 
-    git clone git@github.com:your-username/ReactGuzzleRing.git
+    git clone git@github.com:your-username/react-guzzle-psr7.git
 
 Set up your machine:
 
@@ -20,7 +20,7 @@ Make sure the tests pass on all supported PHP versions (requires docker):
 
 Make your change. Add tests for your change. Make the tests pass:
 
-    make dunit
+    make dunit && make unit
 
 Before committing and submitting your pull request make sure it passes PSR2 coding style, unit tests pass and pass on all supported PHP versions: