diff options
| author | Jacob Thornton <jacobthornton@gmail.com> | 2011-08-31 10:37:46 +0400 |
|---|---|---|
| committer | Jacob Thornton <jacobthornton@gmail.com> | 2011-08-31 10:37:46 +0400 |
| commit | 90d174a34d0c1c0da590fa8f21b1852e358ba0f9 (patch) | |
| tree | 4c1a1bea6a3aba0e39c1f1310f7fbe928131246f /README.md | |
| parent | 4fb1c5bd4b527797183a60e752f0276b01637fd5 (diff) | |
| parent | 44b18f4911e125cc07a6d56292983b0cbfa3ae19 (diff) | |
Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
README.md
bootstrap-1.2.0.css
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -35,7 +35,7 @@ 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 bumpbs the minor +* New additions without breaking backwards compatibility bumps the minor * Bug fixes and misc changes bump the patch For more information on SemVer, please visit http://semver.org/. |