Merge branch 'v3'

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
This commit is contained in:
Zixaphir 2014-05-27 18:46:12 -07:00
commit 1ef6701563
3 changed files with 3 additions and 3 deletions

View File

@ -8172,7 +8172,7 @@
i = links.length;
while (i--) {
link = links[i];
Linkify.embedProcess(Linkify.makeLink(link, this));
Linkify.embedProcess(Linkify.makeLink(link), this);
}
},
embedProcess: function() {},

View File

@ -8223,7 +8223,7 @@
i = links.length;
while (i--) {
link = links[i];
Linkify.embedProcess(Linkify.makeLink(link, this));
Linkify.embedProcess(Linkify.makeLink(link), this);
}
},
embedProcess: function() {},

View File

@ -73,7 +73,7 @@ Linkify =
i = links.length
while i--
link = links[i]
Linkify.embedProcess Linkify.makeLink link, @
Linkify.embedProcess (Linkify.makeLink link), @
return
embedProcess: -> return