Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip

Browse Source

Conflicts:
	docs/extend.html
	docs/templates/pages/extend.mustache

...

This commit is contained in:

Mark Otto

2012-07-17 20:57:20 -07:00

parent 62f6368344 426e7d9fbd

commit a1ad6d124a

3 changed files with 5 additions and 3 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/assets/js/bootstrap.min.js vendored

File diff suppressed because one or more lines are too long