github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	bootstrap.css
	bootstrap.min.css
This commit is contained in:
Jacob Thornton
2012-01-08 00:50:48 -08:00
parent 4478df7681 3c2f82f469
commit bc505560a0
3 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap.css vendored
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;