Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	dist/jquery.dotdotdot.js
#	src/jquery.dotdotdot.js
  • Loading branch information
FrDH committed Nov 14, 2017
2 parents a1c7d57 + b5860bd commit 5ff15a6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/jquery.dotdotdot.js
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@
var that = this,
api = {};

$.each( this.api,
$.each( this.api,
function( i )
{
var fn = this;
Expand Down

0 comments on commit 5ff15a6

Please sign in to comment.