]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip
authorMark Otto <markotto@twitter.com>
Wed, 18 Jul 2012 06:14:58 +0000 (23:14 -0700)
committerMark Otto <markotto@twitter.com>
Wed, 18 Jul 2012 06:14:58 +0000 (23:14 -0700)
commitcb1a59caa013e0fbe992bb305502f37bc7141c92
treebad2dbc16528e7508baa02025cd2a81114ad7341
parentba90d0fc5ea440a49fdf611d95ecfe4d99e8f779
parentb4125748b0d0e12a7855350ee3d9089e0a2f93e7
Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip

Conflicts:
docs/base-css.html
docs/templates/pages/base-css.mustache
docs/assets/css/bootstrap.css
docs/base-css.html
docs/templates/pages/base-css.mustache