diff options
| author | Mark Otto <[email protected]> | 2013-11-06 14:04:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-06 14:04:54 -0800 |
| commit | 6df6723c156ab565c7b6341fc58582fceadd7649 (patch) | |
| tree | 4cc372a56ece6b8250b1bcadf433f6e5ea1853ca /bower.json | |
| parent | b593df183087d88940d7af3e59b401685ada3dfe (diff) | |
| parent | 3887f540b978d593f433bfef15888bc2d103de72 (diff) | |
| download | bootstrap-6df6723c156ab565c7b6341fc58582fceadd7649.tar.xz bootstrap-6df6723c156ab565c7b6341fc58582fceadd7649.zip | |
Merge branch 'master' into docs_derp
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bower.json b/bower.json index b5b393003..ed210a01f 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "bootstrap", - "version": "3.0.1", + "version": "3.0.2", "main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css", "./dist/fonts/*"], "ignore": [ "**/.*" |