2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-24 14:04:09 +03:00

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

Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto
2012-01-25 11:27:29 -08:00
11 changed files with 11 additions and 11 deletions
+1 -1
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: Wed Jan 25 11:24:56 PST 2012
* Date: Wed Jan 25 11:27:15 PST 2012
*/
article,
aside,