Merge branch 'master' into panels_and_tables

Browse source

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

...

This commit is contained in:

Mark Otto 2014-02-07 18:36:27 -08:00

parent d91d9b0ade a2f08158d0

commit 06f1293acf

15 changed files with 28 additions and 19 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