diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-13 15:43:31 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-13 15:43:31 +0100 |
| commit | 06581ba9276310d6f845c84d16fd6c47d66544bf (patch) | |
| tree | 8aaa7790c9f82e6c86a570baaa6f53194039e328 | |
| parent | 13e7bd76a5f5849d839d37438f5fc15229835c79 (diff) | |
| parent | f245198652f3969f8f4a242ae46d9ba735669621 (diff) | |
| download | forums-06581ba9276310d6f845c84d16fd6c47d66544bf.tar forums-06581ba9276310d6f845c84d16fd6c47d66544bf.tar.gz forums-06581ba9276310d6f845c84d16fd6c47d66544bf.tar.bz2 forums-06581ba9276310d6f845c84d16fd6c47d66544bf.tar.xz forums-06581ba9276310d6f845c84d16fd6c47d66544bf.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12188] Add php 5.6 to travis enviroments
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index a077ade0b3..70428d611d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ php: - 5.3 - 5.4 - 5.5 + - 5.6 - hhvm env: |