diff options
| author | Mark Otto <[email protected]> | 2013-12-18 10:22:18 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 10:22:18 -0800 |
| commit | 1bc8607bdffe641d58191084b214138a98aba229 (patch) | |
| tree | ffb2855b592ee37c5068da181a4c3fb335a322da /bower.json | |
| parent | 9e38e255343a4fd5fa2fa932c96be9cb5c902337 (diff) | |
| parent | d15218a09ce68d0854d0aa5f5170c1ea859aee31 (diff) | |
| download | bootstrap-1bc8607bdffe641d58191084b214138a98aba229.tar.xz bootstrap-1bc8607bdffe641d58191084b214138a98aba229.zip | |
Merge branch 'master' into css-source-maps
Conflicts:
Gruntfile.js
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bower.json b/bower.json index 313ff697f..f1680ac61 100644 --- a/bower.json +++ b/bower.json @@ -14,7 +14,6 @@ "_*", "docs-assets", "examples", - "/fonts", "js/tests", "CNAME", "CONTRIBUTING.md", |