diff options
| author | Mark Otto <[email protected]> | 2014-01-01 12:27:09 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-01 12:27:09 -0800 |
| commit | 70459c1454d2d4d1df87e59c9dfa359c92b310bb (patch) | |
| tree | b6fe6447981e749eeb4721d027ae44f6dcc029ca /docs/dist/css/bootstrap-theme.min.css | |
| parent | bab240252ad43f32b4efb04b2a2fde98044c2818 (diff) | |
| parent | c583b7965550e60dd51cb11b50628420291463fe (diff) | |
| download | bootstrap-70459c1454d2d4d1df87e59c9dfa359c92b310bb.tar.xz bootstrap-70459c1454d2d4d1df87e59c9dfa359c92b310bb.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/_includes/footer.html
docs/assets/css/docs.css
Diffstat (limited to 'docs/dist/css/bootstrap-theme.min.css')
| -rw-r--r-- | docs/dist/css/bootstrap-theme.min.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/dist/css/bootstrap-theme.min.css b/docs/dist/css/bootstrap-theme.min.css index 212af2a3a..7a2b584de 100644 --- a/docs/dist/css/bootstrap-theme.min.css +++ b/docs/dist/css/bootstrap-theme.min.css @@ -1,6 +1,6 @@ /*! * Bootstrap v3.0.3 (http://getbootstrap.com) - * Copyright 2013 Twitter, Inc. + * Copyright 2014 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ |