diff options
| author | Mark Otto <[email protected]> | 2012-02-01 22:52:07 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-01 22:52:07 -0800 |
| commit | aa8a7668cba4c9cc85c0902cb5abf703d0ac86c3 (patch) | |
| tree | 2500ca303c185b7ff28bb8e3daa70d98b1b3c97f /Makefile | |
| parent | 58fd0dea36173c8672fd77cf06df2ccfbeb4d068 (diff) | |
| parent | 98d1659ef836cb879ce7d6260351ff35e96ebd25 (diff) | |
| download | bootstrap-aa8a7668cba4c9cc85c0902cb5abf703d0ac86c3.tar.xz bootstrap-aa8a7668cba4c9cc85c0902cb5abf703d0ac86c3.zip | |
Merge branch 'master' into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -10,6 +10,7 @@ WATCHR ?= `which watchr` # docs: bootstrap + rm docs/assets/bootstrap.zip zip -r docs/assets/bootstrap.zip bootstrap rm -r bootstrap lessc ${BOOTSTRAP_LESS} > ${BOOTSTRAP} @@ -42,6 +43,7 @@ bootstrap: # gh-pages: docs + rm -f ../bootstrap-gh-pages/assets/bootstrap.zip node docs/build production cp -r docs/* ../bootstrap-gh-pages |