Permalink
Browse files

Merge branch 'develop' of github.com:Respect/Rest into develop

Conflicts:
	.travis.yml
  • Loading branch information...
2 parents 3167c54 + 664077e commit fc0fd398a7f7519a2e6b2c6ed8d27355ad3da276 @nickl- nickl- committed Jul 23, 2012
Showing with 8 additions and 2 deletions.
  1. +8 −2 .travis.yml
View
@@ -1,5 +1,11 @@
-language: php
-script: "cd tests;phpunit --testdox"
+language:
+ php
+
+before_script:
+ "cd tests"
+
+script:
+ "phpunit --testdox"
php:
- 5.3

0 comments on commit fc0fd39

Please sign in to comment.