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 | |
| 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
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 56825 -> 52356 bytes | |||
| -rw-r--r-- | docs/assets/js/application.js | 3 |
4 files changed, 6 insertions, 5 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 @@ -9,7 +9,7 @@ To get started -- checkout http://twitter.github.com/bootstrap! Versioning ---------- -For transparency and insight into our release cycle, and for striving to maintain backwards compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible. +For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered with the follow format: @@ -17,8 +17,8 @@ Releases will be numbered with the follow format: And constructed with the following guidelines: -* Breaking backwards compatibility bumps the major -* New additions without breaking backwards compatibility bumps the minor +* Breaking backward compatibility bumps the major +* New additions without breaking backward compatibility bumps the minor * Bug fixes and misc changes bump the patch For more information on SemVer, please visit http://semver.org/. diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 4647e747b..faef1d7ea 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index b29b63aee..732bed458 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -135,8 +135,7 @@ , url: 'http://bootstrap.herokuapp.com' , dataType: 'jsonpi' , params: { - branch: '2.0-wip' - , js: js + js: js , css: css , vars: vars , img: img |