mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-05-21 13:24:08 +03:00
Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Conflicts: Makefile README.md bootstrap.css bootstrap.min.css lib/bootstrap.less lib/scaffolding.less
This commit is contained in:
Vendored
+1
-1
@@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* Bootstrap v1.3.0
|
||||
* Bootstrap @VERSION
|
||||
*
|
||||
* Copyright 2011 Twitter, Inc
|
||||
* Licensed under the Apache License v2.0
|
||||
|
||||
Reference in New Issue
Block a user