diff options
| author | Mark Otto <[email protected]> | 2012-01-29 13:25:36 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-29 13:25:36 -0800 |
| commit | 391661f14b734f378ecc704c724269f1d7efbd0f (patch) | |
| tree | eae5066323dfe781f3f1fcddbd32b718dd75df91 /docs | |
| parent | 278858e70698f0dcf8651cb59b13e48fe756d8bd (diff) | |
| parent | 910e78d26ad476d11331e8bb9b0233e0b2ba21e3 (diff) | |
| download | bootstrap-391661f14b734f378ecc704c724269f1d7efbd0f.tar.xz bootstrap-391661f14b734f378ecc704c724269f1d7efbd0f.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 0 -> 50335 bytes | |||
| -rw-r--r-- | docs/index.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/index.mustache | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differnew file mode 100644 index 000000000..0e691e290 --- /dev/null +++ b/docs/assets/bootstrap.zip diff --git a/docs/index.html b/docs/index.html index 69972c843..e20d08bcd 100644 --- a/docs/index.html +++ b/docs/index.html @@ -80,7 +80,7 @@ <p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p> <p class="download-info"> <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">View project on GitHub</a> - <a href="http://bootstrap.herokuapp.com/bootstrap.zip" class="btn btn-large">Download Bootstrap</a> + <a href="assets/bootstrap.zip" class="btn btn-large">Download Bootstrap</a> </p> </div> diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 4ae3b7a6f..d49f95f9b 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -8,7 +8,7 @@ <p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p> <p class="download-info"> <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}View project on GitHub{{/i}}</a> - <a href="http://bootstrap.herokuapp.com/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap{{/i}}</a> + <a href="assets/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap{{/i}}</a> </p> </div> |