Skip to content

Commit

Permalink
Merge branch 'bug/632' of https://github.com/danielstreit/immutable-js
Browse files Browse the repository at this point in the history
…into danielstreit-bug/632
  • Loading branch information
leebyron committed Jan 6, 2016
2 parents 9a46bed + 4d2cfdf commit 96b0946
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions dist/immutable.js
Original file line number Diff line number Diff line change
Expand Up @@ -4871,6 +4871,7 @@
});

SetIterable.prototype.has = IterablePrototype.includes;
SetIterable.prototype.contains = SetIterable.prototype.includes;


// Mixin subclasses
Expand Down
2 changes: 1 addition & 1 deletion dist/immutable.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/IterableImpl.js
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,7 @@ mixin(SetIterable, {
});

SetIterable.prototype.has = IterablePrototype.includes;
SetIterable.prototype.contains = SetIterable.prototype.includes;


// Mixin subclasses
Expand Down

0 comments on commit 96b0946

Please sign in to comment.