diff options
| author | Mark Otto <[email protected]> | 2012-01-27 13:43:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-27 13:43:28 -0800 |
| commit | 335a8686dad95bf8e3c1bd2b1785a20ba9cc10ff (patch) | |
| tree | 28c02ec1c706795bb1afbf9b5c55049485a41b83 /docs/assets/css/bootstrap.css | |
| parent | b1f38bbea85c313f1a9512c821de1255e2a0d537 (diff) | |
| parent | 3c7e3eb7d37507ba12d95024f06d6f872a44eecd (diff) | |
| download | bootstrap-335a8686dad95bf8e3c1bd2b1785a20ba9cc10ff.tar.xz bootstrap-335a8686dad95bf8e3c1bd2b1785a20ba9cc10ff.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/css/bootstrap.css
Diffstat (limited to 'docs/assets/css/bootstrap.css')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0783aa7ee..8cf855b8b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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: Fri Jan 27 13:38:50 PST 2012 + * Date: Fri Jan 27 13:43:19 PST 2012 */ article, aside, |