Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip

Browse Source

Conflicts:
	docs/assets/js/bootstrap.min.js

...

This commit is contained in:

fat

2013-07-17 21:14:02 -07:00

parent bf38241f0d 55fa1acbd6

commit 102df4ff33

4 changed files with 17 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