From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Thu, 23 Jun 2016 09:47:46 +0000 (+0200)
Subject: Merge branch 'master' into 2.1
X-Git-Tag: 2.1.0~70
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4

Merge branch 'master' into 2.1
---

f49d9ca383c9f8a1bc426cfabf6b1cea53ea26b4
diff --cc .travis.yml
index 0e72d207,7fe15c5f..17c3abaf
--- a/.travis.yml
+++ b/.travis.yml
@@@ -65,8 -53,8 +65,8 @@@ before_install
      - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
  
  script:
 -    - travis_wait composer install --no-interaction --no-progress --prefer-dist -o
 +    - 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;