]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
resolve conflict
authorMark Otto <mark.otto@twitter.com>
Fri, 2 Sep 2011 07:29:27 +0000 (00:29 -0700)
committerMark Otto <mark.otto@twitter.com>
Fri, 2 Sep 2011 07:29:27 +0000 (00:29 -0700)
commit1b06f3e84e7f6bc57d2af6c9ffd97a94c911e072
treec936448c908c3bbcfa8c68db1f7bff0047e48f79
parent479e0ccd6bd4c32c2445e0cb6291c17c5aa4f7a2
parent3f1706f5f66bd6f4c5ae9fc33224ffdc0a82a261
resolve conflict
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less