diff options
| author | Mark Otto <[email protected]> | 2014-03-16 20:38:12 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-16 20:38:12 -0700 |
| commit | c93c3714336ecefdb69b4dc7ebc40ea87eb40a36 (patch) | |
| tree | c0ff88481a1977781b0826bd56a0a0fd080ba2e3 /Gruntfile.js | |
| parent | b004c9ac393671489720be06739f01e5c1bec7fe (diff) | |
| parent | 96525fdec431f8d654ce0ea9b4f92c2a3ef9104b (diff) | |
| download | bootstrap-c93c3714336ecefdb69b4dc7ebc40ea87eb40a36.tar.xz bootstrap-c93c3714336ecefdb69b4dc7ebc40ea87eb40a36.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 7d55f4089..4cfcade9f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -390,7 +390,7 @@ module.exports = function (grunt) { build: process.env.TRAVIS_JOB_ID, concurrency: 10, urls: ['http://127.0.0.1:3000/js/tests/index.html'], - browsers: grunt.file.readYAML('test-infra/sauce_browsers.yml') + browsers: grunt.file.readYAML('grunt/sauce_browsers.yml') } } }, |