2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto
2011-12-09 11:33:02 -08:00
12 changed files with 90 additions and 13 deletions
+1 -1
View File
@@ -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 Dec 9 11:23:25 PST 2011
* Date: Fri Dec 9 11:32:45 PST 2011
*/
html, body {
margin: 0;