Merge branch 'master' into icon_paths

Browse source

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

...

This commit is contained in:

Mark Otto 2014-05-22 23:01:42 -07:00

parent 91d51d3fba 10e9fef85c

commit d66b65ddde

39 changed files with 113 additions and 54 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

docs/dist/css/bootstrap.css.map vendored

View file

File diff suppressed because one or more lines are too long