Merge branch 'responsive-embed' of https://github.com/boulox/bootstrap into boulox-responsive-embed

Browse Source

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2014-01-13 20:01:54 -08:00

parent df70e8d845 29e495f03c

commit f4dd6221d4

10 changed files with 128 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