aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2014-02-13 15:42:50 +0100
committerNils Adermann <naderman@naderman.de>2014-02-13 15:42:50 +0100
commitf245198652f3969f8f4a242ae46d9ba735669621 (patch)
tree732c449b9a33c0e00a1ebf63187a5a02f867f620
parentc955d0145697fb866aefd1454127218b976009cd (diff)
parent9d1d90e33620a288158ea764a2af21f74064f058 (diff)
downloadforums-f245198652f3969f8f4a242ae46d9ba735669621.tar
forums-f245198652f3969f8f4a242ae46d9ba735669621.tar.gz
forums-f245198652f3969f8f4a242ae46d9ba735669621.tar.bz2
forums-f245198652f3969f8f4a242ae46d9ba735669621.tar.xz
forums-f245198652f3969f8f4a242ae46d9ba735669621.zip
Merge remote-tracking branch 'github-nickvergessen/ticket/12188' into develop-olympus
* github-nickvergessen/ticket/12188: [ticket/12188] Add php 5.6 to travis enviroments
-rw-r--r--.travis.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 28362481c6..f576f1c800 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ php:
- 5.3
- 5.4
- 5.5
+ - 5.6
env:
- DB=mariadb