diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-05-27 15:42:30 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-05-27 15:42:30 +0200 |
| commit | d738441f38ff8f73506a2d00e91ab759025e38ef (patch) | |
| tree | 23feaf20f0c793a5093cd1ca2767ad1f6998c3d4 | |
| parent | 6da58fc4bf7253ac6aa987d4d2c21f4d17c2d6c5 (diff) | |
| parent | efa96e1817847b94abe6d6d0f3f4a8563339f745 (diff) | |
| download | forums-d738441f38ff8f73506a2d00e91ab759025e38ef.tar forums-d738441f38ff8f73506a2d00e91ab759025e38ef.tar.gz forums-d738441f38ff8f73506a2d00e91ab759025e38ef.tar.bz2 forums-d738441f38ff8f73506a2d00e91ab759025e38ef.tar.xz forums-d738441f38ff8f73506a2d00e91ab759025e38ef.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10909] Also test develop-olympus with low PHP 5.3 version on travis.
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index cc2383de57..20c0c6bf4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: php php: - - 5.3.2 + - 5.3.3 + - 5.3 - 5.4 env: |