summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorTim Moore <tmoore@incrementalism.net>2014-08-24 13:43:01 +1000
committerTim Moore <tmoore@incrementalism.net>2014-08-24 13:43:01 +1000
commit1ce22ac8e0f3417f3ac89f799a1b80751ac7afe4 (patch)
tree3dc21055135f7d8f47ecc52ef2b6e1509aa4e8aa /.travis.yml
parent473770c143ac720f5b115d3e82d395b01f12cb93 (diff)
parentea143105677c4e38a2ce57bf6faa3cb8b782ef68 (diff)
downloadbundler-1ce22ac8e0f3417f3ac89f799a1b80751ac7afe4.tar.gz
Merge tag 'v1.7.1'
Version 1.7.1 Conflicts: CHANGELOG.md lib/bundler/dsl.rb lib/bundler/index.rb lib/bundler/lockfile_parser.rb lib/bundler/source/rubygems.rb man/gemfile.5.ronn
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 60de32f710..b5cebe82a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ before_script: travis_retry rake spec:travis:deps
branches:
only:
- master
+ - 1-7-stable
- 1-6-stable
- 1-5-stable
- 1-3-stable