summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2014-01-05 20:55:06 +0100
committerAndreas Gohr <andi@splitbrain.org>2014-01-05 20:55:06 +0100
commit02630b1988d1137ac7559a37d0d04c0673c9fe64 (patch)
treee20746b4d5b3eac9d2014e0f9eeec8d0dc455406
parent13ae5e00de640e20e25bff36eb1b2585acf153d3 (diff)
parentb7b43c1d69c59007b40925205e4e24962b3b6278 (diff)
downloadrpg-02630b1988d1137ac7559a37d0d04c0673c9fe64.tar.gz
rpg-02630b1988d1137ac7559a37d0d04c0673c9fe64.tar.bz2
Merge branch 'master' into extension_manager
* master: fixed error in .travis.yml
-rw-r--r--.travis.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 93bc500cf..8942e69da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,9 @@ php:
- "5.4"
- "5.3"
notifications:
- irc: "chat.freenode.net#dokuwiki"
+ irc:
+ channels:
+ - "chat.freenode.net#dokuwiki"
on_success: change
on_failure: change
script: cd _test && phpunit --stderr --verbose