mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code Activity

more js chagnes

Browse Source
This commit is contained in:
Jacob Thornton
2011-09-02 21:06:20 -07:00
parent 0e13f8dca1
commit 41242b5ce6
3 changed files with 8 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap-1.2.0.css
Vendored
+1 -5
View File
@@ -6,11 +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.
<<<<<<< HEAD:bootstrap-1.1.1.css
* Date: Sun Aug 28 17:50:10 PDT 2011
=======
* Date: Fri Sep 2 15:07:03 PDT 2011
>>>>>>> 2589c0ac4ecc86feed81cfc5df344e0eb78cda64:bootstrap-1.2.0.css
* Date: Fri Sep 2 21:04:38 PDT 2011
*/
/* 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).