mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-27 15:19:52 +02:00
Code Issues 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

2
docs/assets/css/bootstrap-responsive.css vendored
View File

@@ -273,4 +273,4 @@
.offset12 { .offset(12); }
}
*/
*/

1
docs/assets/css/bootstrap.css vendored
View File

@@ -6,7 +6,6 @@
* 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 21:07:37 PST 2012
*/
article,
aside,