]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch '2.1.0-wip' of https://github.com/tobz/bootstrap into tobz-2.1.0-wip
authorMark Otto <markotto@twitter.com>
Fri, 17 Aug 2012 23:04:35 +0000 (16:04 -0700)
committerMark Otto <markotto@twitter.com>
Fri, 17 Aug 2012 23:04:35 +0000 (16:04 -0700)
1  2 
less/sprites.less

Simple merge