2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00

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

Conflicts:
	bootstrap.css
	bootstrap.min.css
This commit is contained in:
Jacob Thornton
2012-01-08 00:50:48 -08:00
3 changed files with 33 additions and 5 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: Sat Jan 7 23:50:13 PST 2012
* Date: Sun Jan 8 00:50:20 PST 2012
*/
html, body {
margin: 0;