diff options
| author | Mark Otto <[email protected]> | 2014-01-13 22:43:18 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-13 22:43:18 -0800 |
| commit | eca81939ccb989d6677ed5660d1db812cfabbff8 (patch) | |
| tree | 51bf781bd68b7a064baf02b0c19f0c3f4c544cd6 /docs/assets/css/docs.css | |
| parent | b17dca240e1e405088e0ebe316a3b3ebd3054e5b (diff) | |
| parent | 8c0cb806c6471749761efb4f9c892344d357e769 (diff) | |
| download | bootstrap-eca81939ccb989d6677ed5660d1db812cfabbff8.tar.xz bootstrap-eca81939ccb989d6677ed5660d1db812cfabbff8.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/assets/css/pack.min.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
Diffstat (limited to 'docs/assets/css/docs.css')
| -rw-r--r-- | docs/assets/css/docs.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 772a0ebcf..edfabcd33 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -1,7 +1,7 @@ /*csslint ids: false, overqualified-elements: false, fallback-colors: false*/ /*! + * Bootstrap Docs (http://getbootstrap.com) * Copyright 2011-2014 Twitter, Inc. - * * Licensed under the Creative Commons Attribution 3.0 Unported License. For * details, see http://creativecommons.org/licenses/by/3.0/. */ |