Merge branch 'master' into icon_paths

Browse Source

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

...

This commit is contained in:

Mark Otto

2014-05-12 19:57:49 -07:00

parent 510f4fe50a be18f50fd0

commit 31956be6ef

54 changed files with 119 additions and 8321 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

docs/dist/css/bootstrap.css.map

Vendored

+1 -1

File diff suppressed because one or more lines are too long