]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' of http://git.local.twitter.com/bootstrap
authorJacob Thornton <jacobthornton@gmail.com>
Thu, 30 Jun 2011 17:44:04 +0000 (10:44 -0700)
committerJacob Thornton <jacobthornton@gmail.com>
Thu, 30 Jun 2011 17:44:04 +0000 (10:44 -0700)
commit9282876b443daed99cbfac10ff6adace8b916f6b
tree106c9ceb1f9c55e7e1f6894abe5e65de4e65834c
parent518c882da08390d45194d318ab575ed10766a382
parent588b2da937dd5c34766863fba3a9daaf2276d900
Merge branch 'master' of http://git.local.twitter.com/bootstrap

Conflicts:
lib/bootstrap.less
lib/bootstrap.less