kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

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

Browse source 
Conflicts:
	bootstrap.css
	lib/responsive.less
This commit is contained in:
Mark Otto 2011-10-22 15:51:24 -07:00
commit fb7fbdb278
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bootstrap.css vendored
View file

@ -6,7 +6,11 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
<<<<<<< HEAD
* Date: Sat Oct 22 15:49:12 PDT 2011
=======
* Date: Fri Oct 21 11:54:44 CDT 2011
>>>>>>> 2e09ffe3832106fab60dc01cc3159c13029bdf68
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).