Merge branch 'pr/13320'

Browse Source

Conflicts:
	dist/css/bootstrap-rtl.min.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap-rtl.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2014-04-30 19:48:22 -07:00

parent 17f77a5070 108b7c390e

commit 4c3ef52fc1

10 changed files with 38 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

dist/css/bootstrap.css.map vendored

File diff suppressed because one or more lines are too long