]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
authorJacob Thornton <jacobthornton@gmail.com>
Sun, 11 Sep 2011 05:17:37 +0000 (22:17 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Sun, 11 Sep 2011 05:17:37 +0000 (22:17 -0700)
commitc40e0de3c1d837b2754f7717ebdc4a29c5f92cd8
tree9f501ded45d3326bf58640c325b7e6cbfd0f2b54
parent64176caa972fdf925fe244cdbf1d53d82da592f4
parent536fe2c7437969ec64c14d6d790c5e7c684a6ccc
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip

Conflicts:
docs/index.html
docs/index.html
docs/javascript.html