mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
Code Activity

Merge branch 'zerkms-master' into 2.0.2-wip

Browse Source 
Conflicts:
	Makefile
This commit is contained in:
Mark Otto
2012-03-11 17:38:23 -07:00
parent 8fd126ba1b 354252b4b5
commit 95cb6f07a8
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -2
View File
@@ -19,7 +19,6 @@ docs: bootstrap
cp img/* docs/assets/img/
cp js/*.js docs/assets/js/
cp js/tests/vendor/jquery.js docs/assets/js/
cp js/tests/vendor/jquery.js docs/assets/js/
#
# BUILD SIMPLE BOOTSTRAP DIRECTORY
@@ -59,4 +58,4 @@ watch:
watchr -e "watch('less/.*\.less') { system 'make' }"
.PHONY: docs watch gh-pages
.PHONY: docs watch gh-pages