]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'kriansa-patch1' into dev
authorMark Otto <mark.otto@twitter.com>
Tue, 1 Nov 2011 06:28:05 +0000 (23:28 -0700)
committerMark Otto <mark.otto@twitter.com>
Tue, 1 Nov 2011 06:28:05 +0000 (23:28 -0700)
commit5c86074fa9e5c8f39fa9ad4f4b8f028a8d5aebe6
treea74e445e94d83adab5267124907e423eaaa8b35e
parenta21363a749f7d30a282e24cefd83840a5a3fca7c
parent602919aae83a0f6d12a2c3dcdcdb8c3f1579b647
Merge branch 'kriansa-patch1' into dev

Conflicts:
bootstrap.css
bootstrap.css
bootstrap.min.css
lib/patterns.less