github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-02-06 03:54:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
This commit is contained in:
Mark Otto
2012-01-27 21:09:24 -08:00
parent 3934d1b6c4 15d3a4797f
commit d0447e9aa5
5 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
less/bootstrap.less vendored
View File

@@ -1,12 +1,11 @@
/*!
* Bootstrap @VERSION
* Bootstrap v2.0.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: @DATE
*/
// CSS Reset