Remove .ruby-version due to https://github.com/twbs/bootstrap/commit/4f20a29c329aa58919919426cbd2190fabfdb723
Merge pull request #10871 from ZDroid/patch-2

Remove .ruby-version from excludes
run grunt
unify button sizing, use mixin ".button-size" also for the base sized button
Correct grammar

Jekyll is the third person singular (it), so it should be 'its documentation', not 'their documentation'.
Merge pull request #10932 from ZDroid/patch-1

Correct grammar
Fix #10948: Clarify navbar example target in docs
Change all navbar example targets

According to comment on https://github.com/twbs/bootstrap/issues/10948#issuecomment-25751889 .
Merge pull request #10950 from twbs/docs-navbar-class

Fix #10948: Clarify navbar example target in docs
fix #10961
document .h1 thru .h6; fixes part of #10102
Merge pull request #10962 from twbs/doc-h1-thru-h6-classes

document .h1 thru .h6; fixes part of #10102
Merge branch '3.0.0'

Conflicts:
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css
	scss/_buttons.scss