diff options
| author | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
|---|---|---|
| committer | Alexandr Kondrashov <[email protected]> | 2015-09-11 16:43:00 +0300 |
| commit | c9725926b2f30bed4e37f57c20ef8ffeb2fd233b (patch) | |
| tree | 2964ad7556549dd3e0712bdfdbc5fc4ae7a9b45f /docs/assets/scss/docs.scss | |
| parent | 353e0a49a97c24d89f6cdb95014419d4137dee6e (diff) | |
| parent | b811f8cf9628dbcbfe994f71588c5a0c921a092d (diff) | |
| download | bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.tar.xz bootstrap-c9725926b2f30bed4e37f57c20ef8ffeb2fd233b.zip | |
Merge remote-tracking branch 'twbs/v4-dev' into patch-1
Conflicts:
scss/_custom-forms.scss
scss/_variables.scss
Diffstat (limited to 'docs/assets/scss/docs.scss')
| -rw-r--r-- | docs/assets/scss/docs.scss | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/assets/scss/docs.scss b/docs/assets/scss/docs.scss index 437207d4d..35008facc 100644 --- a/docs/assets/scss/docs.scss +++ b/docs/assets/scss/docs.scss @@ -1,8 +1,8 @@ /*! * Bootstrap Docs (http://getbootstrap.com) - * Copyright 2011-2014 Twitter, Inc. + * Copyright 2011-2015 Twitter, Inc. * Licensed under the Creative Commons Attribution 3.0 Unported License. For - * details, see http://creativecommons.org/licenses/by/3.0/. + * details, see https://creativecommons.org/licenses/by/3.0/. */ // Dev notes @@ -46,6 +46,7 @@ $bd-info: #5bc0de; @import "ads"; @import "content"; @import "page-header"; +@import "skiplink"; @import "sidebar"; @import "footer"; @import "component-examples"; |