diff options
| author | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
| commit | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (patch) | |
| tree | edb73c6ae943629dbdc51d3350a50a079f7a2f7e /bower.json | |
| parent | 04161a8c753c5f9ef83dd1f0848a17e8c4ab155c (diff) | |
| parent | 7f153974e10980dccbdd485e63941b591e925148 (diff) | |
| download | bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.tar.xz bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/assets/css/docs.css
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bower.json b/bower.json index 237f8e9ba..c63fbf1e7 100644 --- a/bower.json +++ b/bower.json @@ -11,13 +11,11 @@ ], "ignore": [ "**/.*", - "*.html", - "_*", + "_config.yml", "CNAME", "composer.json", "CONTRIBUTING.md", - "docs-assets", - "examples", + "docs", "js/tests" ], "dependencies": { |