summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-07-19 14:17:13 +0200
committerAndrey Andreev <narf@bofh.bg>2012-07-19 14:17:13 +0200
commit391dc6cdec77c4a71a7a6589652bd8d4a3623154 (patch)
treecc979f745da239cdc8aff74ea6bf43cbea860cf6 /.travis.yml
parent2d486231c0fbc9a5c9ad5bf6897e7bb1aff275ba (diff)
parentfa4af2c268eb920e8eb772b793962000c10ac79c (diff)
Merge develop changes
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 31b74b13b..2496def0b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,4 +23,5 @@ script: phpunit --coverage-text --configuration tests/travis/$DB.phpunit.xml
branches:
only:
- - develop \ No newline at end of file
+ - develop
+ - /^feature\/.+$/ \ No newline at end of file