Skip to content

Commit

Permalink
Merge pull request #20 from esr360/release/3.10.0
Browse files Browse the repository at this point in the history
Release/3.10.0
  • Loading branch information
esr360 authored Jun 20, 2018
2 parents 07ae4f5 + 2132c70 commit 4735044
Show file tree
Hide file tree
Showing 27 changed files with 4,447 additions and 1,405 deletions.
509 changes: 254 additions & 255 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/_synergy.scss
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ $module: null !default;
/// @param {map} $map-old - The map which holds default configuration
/// @param {map} $map-new - The map which holds custom values
/// @param {string} $parser - Custom parser to use for configuration
@function config($map-old, $map-new, $parser: $sass-config-parser) {
@function config($map-old: (), $map-new: (), $parser: $sass-config-parser) {

$map-old: map-merge((
'selector-type' : $selector-type,
Expand Down
Loading

0 comments on commit 4735044

Please sign in to comment.