]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'dev' of github.com:twitter/bootstrap into dev
authorMark Otto <mark.otto@twitter.com>
Tue, 1 Nov 2011 06:22:13 +0000 (23:22 -0700)
committerMark Otto <mark.otto@twitter.com>
Tue, 1 Nov 2011 06:22:13 +0000 (23:22 -0700)
commita21363a749f7d30a282e24cefd83840a5a3fca7c
treec3dc61772359fdcbb75418bd105a61e3e5579f70
parent98007b8394a5cf892694000d066a07a32f8c517f
parent8f726dc6ef3ee725ef032ef4a11dbce26982ae24
Merge branch 'dev' of github.com:twitter/bootstrap into dev

Conflicts:
bootstrap.css
bootstrap.css
bootstrap.min.css
docs/index.html
lib/forms.less