aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-06-28 09:25:02 -0700
committerMark Otto <[email protected]>2013-06-28 09:25:02 -0700
commit2d2828d36ccaca2f6db42352d59ab4906a7439f6 (patch)
tree7d30850029133b417762733253977040d089b3fc
parent0a92efce0cbded7b664a5e198bfe6bca3b13bcac (diff)
parent8ef30021536347b7c12b029d1fdf85e5a115642b (diff)
downloadbootstrap-2d2828d36ccaca2f6db42352d59ab4906a7439f6.tar.xz
bootstrap-2d2828d36ccaca2f6db42352d59ab4906a7439f6.zip
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b54f149ab..257754b50 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ clean:
# recess & uglifyjs are required
#
-bootstrap: bootstrap-fonts bootstrap-css bootstrap-js
+bootstrap: bootstrap-css bootstrap-js
#