diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
| commit | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (patch) | |
| tree | 2964ad7556549dd3e0712bdfdbc5fc4ae7a9b45f /test-infra/S3Cachefile.json | |
| parent | 353e0a49a97c24d89f6cdb95014419d4137dee6e (diff) | |
| parent | b811f8cf9628dbcbfe994f71588c5a0c921a092d (diff) | |
| download | bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.tar.xz bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.zip | |
Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
scss/_custom-forms.scss
scss/_variables.scss
Diffstat (limited to 'test-infra/S3Cachefile.json')
| -rw-r--r-- | test-infra/S3Cachefile.json | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/test-infra/S3Cachefile.json b/test-infra/S3Cachefile.json deleted file mode 100644 index 90eae796d..000000000 --- a/test-infra/S3Cachefile.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "npm-modules": { - "key": "./npm-shrinkwrap.json", - "cache": "../node_modules", - "generate": "./uncached-npm-install.sh" - }, - "rubygems": { - "key": "$BUNDLE_GEMFILE", - "cache": "../vendor/cache", - "generate": "cd .. ; bundle install --path=\"`pwd`/vendor/cache\"" - } -} |