diff options
author | Mark Otto <markotto@twitter.com> | 2012-03-12 04:38:23 +0400 |
---|---|---|
committer | Mark Otto <markotto@twitter.com> | 2012-03-12 04:38:23 +0400 |
commit | 95cb6f07a8fc2410873c59addd3f1aad948e54fd (patch) | |
tree | 3301949733a3d6500c80a039a1094ae2a53cc51e /Makefile | |
parent | 8fd126ba1ba8c76f9b11833380db91554a034794 (diff) | |
parent | 354252b4b506221f14d3f95627b0c887eb160caa (diff) |
Merge branch 'zerkms-master' into 2.0.2-wip
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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
\ No newline at end of file +.PHONY: docs watch gh-pages |