mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code Activity

Merge branch 'master' of http://git.local.twitter.com/bootstrap

Browse Source 
Conflicts:
	lib/bootstrap.less
This commit is contained in:
Jacob Thornton
2011-06-30 10:44:04 -07:00
parent 518c882da0 588b2da937
commit 9282876b44
8 changed files with 79 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/bootstrap.less
Vendored
+10 -11
View File
@@ -1,14 +1,13 @@
/*!
* Bootstrap v0.0.1
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Made with love by two broheims, @mdo and @fat
* Date: {{ date }}
*/
/*!
* Bootstrap v1.0.0
*
* Copyright 2011 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
@import "reset.less";