Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

2016-09-28 17:54:10 +02:00 · 2016-09-28 17:54:10 +02:00 · c110297032
commit c110297032
parent d953d3795f b1aa4d01d6
1 changed files with 1 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -257,7 +257,7 @@ script:
  # Ensure we catch errors
  set -e
  # Exclusions are defined in the ruleset.xml file
-  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/codesniffer/ruleset.xml --encoding=utf-8 .
+  phpcs -s -n -p -d memory_limit=-1 --colors --tab-width=4 --standard=dev/setup/codesniffer/ruleset.xml --encoding=utf-8 .
  set +e
  echo