diff options
| author | Mark Otto <[email protected]> | 2015-01-03 16:00:45 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-03 16:00:45 -0800 |
| commit | 31610258de7a7eeb635103de25f7f339f872d867 (patch) | |
| tree | cb15111a25e77d67c1b7d54a6c068ec83e23bc9d | |
| parent | c6af78e8a4e58fe2a09022ab04f04f14722d2795 (diff) | |
| parent | 4e8f769d442f15bd5c5ca07bfed1c93651ba08cb (diff) | |
| download | bootstrap-31610258de7a7eeb635103de25f7f339f872d867.tar.xz bootstrap-31610258de7a7eeb635103de25f7f339f872d867.zip | |
Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
| -rw-r--r-- | scss/_mixins.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scss/_mixins.scss b/scss/_mixins.scss index 801b5c7e9..5cba1afdf 100644 --- a/scss/_mixins.scss +++ b/scss/_mixins.scss @@ -3,7 +3,7 @@ // Toggles // -// Used in conjuntion with global variables to enable certain theme features. +// Used in conjunction with global variables to enable certain theme features. @mixin border-radius($radius: $border-radius-base) { @if $enable-rounded { |