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 github.com:twitter/bootstrap into 2.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/download.html
This commit is contained in:
Mark Otto
2012-01-27 13:21:01 -08:00
parent e8647c1b11 3b3dbd7229
commit ccd963e622
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/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: Fri Jan 27 13:19:35 PST 2012
* Date: Fri Jan 27 13:20:51 PST 2012
*/
article,
aside,