]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip
authorJacob Thornton <jacobthornton@gmail.com>
Tue, 24 Jan 2012 22:31:10 +0000 (14:31 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Tue, 24 Jan 2012 22:31:10 +0000 (14:31 -0800)
commitfbc1ab14cc7e591f4b2e53ef3fb25ef7dc243fce
tree01e1f91f11aff4836d6623257387b68b76dd84bf
parenta800d6ceac11eb834295567c20e890abf88c64af
parentfea1dc906e153440896a8c62d89fd2dfa7c39b9a
Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip

Conflicts:
docs/templates/pages/index.mustache
docs/index.html
docs/templates/pages/index.mustache