]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.1.0-wip' of https://github.com/nextgenthemes/bootstrap into nextgenth...
authorMark Otto <markotto@twitter.com>
Mon, 9 Jul 2012 07:39:56 +0000 (00:39 -0700)
committerMark Otto <markotto@twitter.com>
Mon, 9 Jul 2012 07:39:56 +0000 (00:39 -0700)
commit50a945e084e0153bd7e087cf29cdb2c176dbf4b8
tree16b933fb7a7e7f3b787eb8f7a6b9b2d9a7177af0
parent25d0b341a9a89ae2f0da4a506c26ac77db011350
parent7d1c8c2a0ce16331583a965821690f7715e62908
Merge branch '2.1.0-wip' of https://github.com/nextgenthemes/bootstrap into nextgenthemes-2.1.0-wip

Conflicts:
less/buttons.less
less/buttons.less