diff options
| author | Jacob Thornton <[email protected]> | 2012-01-31 13:59:40 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-31 13:59:40 -0800 |
| commit | fd700e358da02434343c58e7f86eb2e8a8ba2411 (patch) | |
| tree | 831e00c3f661af6bf3bb977ab31a8225d969e822 /Makefile | |
| parent | b9de88890e3db18b48ef10cd5a718002cb5dc4a0 (diff) | |
| parent | e75bc5eb5ffca534fd3a84d749e8b39824654ebb (diff) | |
| download | bootstrap-fd700e358da02434343c58e7f86eb2e8a8ba2411.tar.xz bootstrap-fd700e358da02434343c58e7f86eb2e8a8ba2411.zip | |
Merge branch '2.0-wip'
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -16,6 +16,8 @@ docs: bootstrap lessc ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE} node docs/build cp img/* docs/assets/img/ + cp js/*.js docs/assets/js/ + cp js/tests/vendor/jquery.js docs/assets/js/ # # BUILD SIMPLE BOOTSTRAP DIRECTORY |