Merge branch 'master' into 2.1

2016-06-23 11:47:46 +02:00
parent 49e2854d5c fb5c17a9ab
commit f49d9ca383
54 changed files with 133 additions and 102 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -67,6 +67,6 @@ before_install:
 script:
    - travis_wait bash install.sh
    - ant prepare-$DB
-    - bin/phpunit -v
+    - phpunit -v
    - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
    - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;