diff options
| author | Mark Otto <[email protected]> | 2016-09-15 10:20:57 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-09-15 10:20:57 -0700 |
| commit | 64dcb8b5073293daa911d2b274fd875f31693317 (patch) | |
| tree | 112821f9bdd9b51f8953521cc2f34a537ccf74a2 /package.json | |
| parent | 15f522fd4ae3fe7933d526f045b0b2df22a35291 (diff) | |
| parent | 63129112bbea91f7cd62014f162f857f50084656 (diff) | |
| download | bootstrap-64dcb8b5073293daa911d2b274fd875f31693317.tar.xz bootstrap-64dcb8b5073293daa911d2b274fd875f31693317.zip | |
Merge branch 'v4-dev' into v4-navbars
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/package.json b/package.json index 38d6b87bf..c056861ee 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "version": "4.0.0-alpha.2", + "version": "4.0.0-alpha.4", "keywords": [ "css", "sass", @@ -28,7 +28,7 @@ }, "style": "dist/css/bootstrap.css", "sass": "scss/bootstrap.scss", - "main": "./dist/js/npm", + "main": "dist/js/bootstrap", "repository": { "type": "git", "url": "https://github.com/twbs/bootstrap.git" @@ -81,16 +81,13 @@ "files": [ "dist", "grunt", - "js/*.js", + "js/**/*.js", "scss/**/*.scss", "Gruntfile.js", "LICENSE" ], "jspm": { "main": "js/bootstrap", - "ignore": [ - "dist/js/npm" - ], "directories": { "lib": "dist" }, |