mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 00:29:52 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip

Browse Source 
Conflicts:
	README.md
	bootstrap-1.2.0.css
This commit is contained in:
Jacob Thornton
2011-08-30 23:37:46 -07:00
parent 4fb1c5bd4b 44b18f4911
commit 90d174a34d
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -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/.