diff options
| author | Chris Rebert <[email protected]> | 2013-12-29 20:29:44 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2013-12-29 20:29:44 -0800 |
| commit | 7f20eff44def53a3c1e545a17c60f614f885e921 (patch) | |
| tree | 4a8d9f070fa5616d42f1de811de596f4903b4c46 | |
| parent | d18ba5083785052f37bc9e929fb315b144e88987 (diff) | |
| parent | 990c2392e5ff06d57ba4272de7563a42ddf3d38e (diff) | |
| download | bootstrap-7f20eff44def53a3c1e545a17c60f614f885e921.tar.xz bootstrap-7f20eff44def53a3c1e545a17c60f614f885e921.zip | |
Merge pull request #12041 from twbs/mv-sauce-into-infra
mv sauce_browsers.yml out of the project root
| -rw-r--r-- | Gruntfile.js | 2 | ||||
| -rw-r--r-- | test-infra/sauce_browsers.yml (renamed from sauce_browsers.yml) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 46d5184b0..3f977dbfc 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -270,7 +270,7 @@ module.exports = function (grunt) { build: process.env.TRAVIS_JOB_ID, concurrency: 3, urls: ['http://127.0.0.1:3000/js/tests/index.html'], - browsers: grunt.file.readYAML('sauce_browsers.yml') + browsers: grunt.file.readYAML('test-infra/sauce_browsers.yml') } } } diff --git a/sauce_browsers.yml b/test-infra/sauce_browsers.yml index a43051405..a43051405 100644 --- a/sauce_browsers.yml +++ b/test-infra/sauce_browsers.yml |