]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
resolve conflicts
authorMark Otto <mark.otto@twitter.com>
Fri, 2 Sep 2011 07:52:22 +0000 (00:52 -0700)
committerMark Otto <mark.otto@twitter.com>
Fri, 2 Sep 2011 07:52:22 +0000 (00:52 -0700)
commit251882892f27fa074d9f801c651060552a970282
tree32cf528b0b33d8740c25cf3cafb1be4f515f185c
parentfa94b264fa9b552427a349235e176543af4be6d1
parent2a5d829c4a09f82aa9ce4ab8db2025aec91c120b
resolve conflicts
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
docs/index.html
lib/patterns.less