Merge branch 'master' of github.com:guard/guard

2011-09-05 10:40:13 +02:00 · 2011-09-05 10:40:13 +02:00 · 58af2b2c1d
commit 58af2b2c1d
parent 330493a572 d88ffec9a0
1 changed files with 2 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -9,7 +9,8 @@ branches:
    - master
    - hook
    - stdin
-    - jruby_on_travis
+    - jruby_travis_ctime_bug
    - jruby_specs
 notifications:
  recipients:
    - thibaud@thibaud.me