]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkingto...
authorMark Otto <markotto@twitter.com>
Fri, 23 Mar 2012 00:12:22 +0000 (17:12 -0700)
committerMark Otto <markotto@twitter.com>
Fri, 23 Mar 2012 00:12:22 +0000 (17:12 -0700)
commitb59cb505f8cf4e0010f422f0a83d9c001055cbd7
tree334b36865d127c338432137bb9cbdab2ebaa70a9
parentfa1b3bdda479e4c419826e2e56fcddb90d6c3519
parent99e96f64f7dbaba8c83d7d69e64247969765b9e8
Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link

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