diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-09-03 06:23:55 +0400 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2014-09-03 06:23:55 +0400 |
| commit | ee64428a406674ee20365cabb79b95536d3687f1 (patch) | |
| tree | e55f239e86e9073b8df92aea67c2f373f08dfc3d /.travis.yml | |
| parent | 4ae2c8b8863aef79c326059f29fe4afbf9d75162 (diff) | |
| parent | 881ce27c6b4101698ea849283933203e20861a33 (diff) | |
Merge branch 'master' into next
Conflicts:
assets/stylesheets/bootstrap/_variables.scss
lib/bootstrap-sass/version.rb
test/test_helper.rb
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 58c32818..828b2226 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ gemfile: - test/gemfiles/sass_3_4.gemfile - test/gemfiles/sass_head.gemfile before_install: - - "npm install node-sass mincer ejs" + - "npm install" matrix: allow_failures: # rbx has issues https://github.com/rubinius/rubinius/issues/3060 |