1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 00:29:52 +02:00

le merging conflicts

This commit is contained in:
Mark Otto
2011-08-29 21:26:53 -07:00
parent 654cc5ad3f
commit f17fc367f7
6 changed files with 221 additions and 59 deletions

View File

@@ -23,6 +23,24 @@ Or if you prefer, the standard css way:
For more info, refer to the docs!
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.
Releases will be numbered with the follow format:
`<major>.<minor>.<patch>`
And constructed with the following guidelines:
* Breaking backwards compatibility bumps the major
* New additions without breaking backwards compatibility bumpbs the minor
* Bug fixes and misc changes bump the patch
For more information on SemVer, please visit http://semver.org/.
Bug Tracker
-----------