]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.0-wip'
authorJacob Thornton <jacobthornton@gmail.com>
Tue, 31 Jan 2012 22:38:06 +0000 (14:38 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Tue, 31 Jan 2012 22:38:06 +0000 (14:38 -0800)
commitcabba91c7c74fcf6dd80bef8b3ea2717eec997b3
tree4441de5b2eadadbad8134a7054d0c5cce1a92aa2
parent334e5f25c4a6e9f75aa415724ac9d4fa0fbee055
parentc84b5cf5f52ad9be72adf9de2956baad1d6e025b
Merge branch '2.0-wip'

Conflicts:
docs/assets/bootstrap.zip
docs/assets/bootstrap.zip