diff options
| author | Fabian Becker <halfdan@xnorfz.de> | 2013-04-09 21:55:44 +0400 |
|---|---|---|
| committer | Fabian Becker <halfdan@xnorfz.de> | 2013-04-09 21:55:44 +0400 |
| commit | d603aa28e31b7a8c9bf3da7d7408885c2fca03d4 (patch) | |
| tree | 674daeb3def25953cf7b1a251be93cf9385cf53b /.travis.yml | |
| parent | 757815fc2cd8207caf3f50ad6c2463d317236916 (diff) | |
| parent | d9ff5001ecfe0fc763e62dc3a9363fc4a45d02d3 (diff) | |
Merge branch 'master' into 2.x-twig
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index b94c373042..bff0daf372 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ before_script: - composer install - uname -a - date + - php -r "var_dump(gd_info());" - mysql -e 'create database piwik_test;' - ./tests/travis/prepare.sh - ./tests/travis/setup_webserver.sh |