diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-11 18:53:36 +0100 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-11 18:53:36 +0100 |
| commit | eef7a4dbf49173381c65f3972e14a65675d83b77 (patch) | |
| tree | 8f183e0d433913cc7871203ada58ab4af16da905 /travis | |
| parent | 18fea1b2865e30e0784711965806c1b5331f0fe7 (diff) | |
| parent | d142bebdd65d2d21fb475a64c6587ff9e9d669ca (diff) | |
| download | forums-eef7a4dbf49173381c65f3972e14a65675d83b77.tar forums-eef7a4dbf49173381c65f3972e14a65675d83b77.tar.gz forums-eef7a4dbf49173381c65f3972e14a65675d83b77.tar.bz2 forums-eef7a4dbf49173381c65f3972e14a65675d83b77.tar.xz forums-eef7a4dbf49173381c65f3972e14a65675d83b77.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14529] Stop using --prefer-source for composer
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/setup-phpbb.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh index 0beaa9ec8c..f9fd9522ca 100755 --- a/travis/setup-phpbb.sh +++ b/travis/setup-phpbb.sh @@ -37,5 +37,5 @@ then fi cd phpBB -php ../composer.phar install --dev --no-interaction --prefer-source +php ../composer.phar install --dev --no-interaction cd .. |