mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-20 14:56:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into feature_xpath

Browse source 
# Conflicts:
#	Gruntfile.js
#	src/js/.jshintrc
This commit is contained in:
Mike Schwörer 2016-12-16 22:15:53 +01:00
commit 4c36123fd7
No known key found for this signature in database
GPG key ID: D3C7172E0A70F8CF
52 changed files with 1938 additions and 1692 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/operations/Extract.js
View file

@ -25,7 +25,7 @@ var Extract = {
total = 0,
match;
while (!!(match = search_regex.exec(input))) {
while ((match = search_regex.exec(input))) {
if (remove_regex && remove_regex.test(match[0]))
continue;
total++;