github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-02-12 23:15:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less
This commit is contained in:
Jacob Thornton
2011-09-16 11:24:07 -07:00
parent aa43239088 427a001c47
commit c7c5ce8dcd
6 changed files with 149 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bootstrap.less vendored
View File

@@ -1,5 +1,5 @@
/*!
* Bootstrap v1.3.0
* Bootstrap @VERSION
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0