aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-04-02 10:53:08 +0100
committerLouise Crow <louise.crow@gmail.com>2013-04-02 10:53:08 +0100
commita844d68ee68653cbf51c9a3f4f97a65a5f0fc5f3 (patch)
tree83e470ada2b174821346b6d4d0ae50c8b33cf967
parentb8699f361591f428a5260bf99b7ba4679e89a324 (diff)
parent632381d9f4a56c5ee8e8764b12ce0d36521bdac2 (diff)
Merge branch 'develop' into rails-3-develop
-rw-r--r--.travis.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 2f06f6cd9..a8ca00c6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ branches:
only:
- develop
- master
+ - rails-3-develop
rvm:
- 1.8.7
- 1.9.3