Merge branch 'master' into sr_friendly_hidden_content

Browse Source

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

...

This commit is contained in:

Mark Otto

2014-08-27 22:38:46 -07:00

parent dfa2759a52 1ebc7e62a8

commit f4eefd28d1

29 changed files with 214 additions and 207 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