]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'raphaelz-patch-1' into 2.0.1-wip
authorMark Otto <markdotto@gmail.com>
Tue, 7 Feb 2012 07:36:31 +0000 (23:36 -0800)
committerMark Otto <markdotto@gmail.com>
Tue, 7 Feb 2012 07:36:31 +0000 (23:36 -0800)
commit4ed1b13719083fb9bb7ab7273cc9bf84482992cc
treefd67d1ffb5e9edfc549b5d21e389a9729e4f00ba
parent575b82473f8d248ca3782fa86ce1c92eea03905c
parent3722bb9a88e95b37ded12cb40a67ac396ce140fd
Merge branch 'raphaelz-patch-1' into 2.0.1-wip

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip
docs/javascript.html
docs/templates/pages/javascript.mustache