From: Jacob Thornton Date: Fri, 27 Jan 2012 22:44:58 +0000 (-0800) Subject: Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip X-Git-Tag: v2.0.0~6^2~114^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=065ed01b1f78a1e5d358b78304ef211d7b96f362;p=thirdparty%2Fbootstrap.git Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip Conflicts: docs/assets/css/bootstrap.css --- 065ed01b1f78a1e5d358b78304ef211d7b96f362 diff --cc docs/assets/css/bootstrap.css index 176238fc66,5ebfba675c..0a45b94a39 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@@ -6,7 -6,7 +6,7 @@@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Fri Jan 27 14:44:00 PST 2012 - * Date: Fri Jan 27 14:21:03 PST 2012 ++ * Date: Fri Jan 27 14:44:44 PST 2012 */ article, aside, diff --cc docs/assets/img/glyphicons-halflings-white.png index 0000000000,0000000000..a20760bfde new file mode 100644 Binary files differ diff --cc docs/assets/img/glyphicons-halflings.png index 0000000000,0000000000..92d4445dfd new file mode 100644 Binary files differ