Commit Graph

2107 Commits

Author SHA1 Message Date
n1474335 46425ba552 Merge branch 'JSONTOCSV' of https://github.com/n1073645/CyberChef into n1073645-JSONTOCSV 2021-02-01 16:34:57 +00:00
n1474335 be544faf0f Merge branch 'datetime' of https://github.com/n1073645/CyberChef into n1073645-datetime 2021-02-01 16:13:43 +00:00
n1474335 3df57ba3dd Added big and little endian options for Windows timestamp conversion ops 2021-02-01 16:11:39 +00:00
n1474335 357c90546e Merge branch 'FiletimeEndianness' of https://github.com/n1073645/CyberChef into n1073645-FiletimeEndianness 2021-02-01 15:55:42 +00:00
n1474335 5947ed21fc Tidied up localisation in Wikipedia URL 2021-02-01 15:51:14 +00:00
n1474335 0a0949246f Merge branch 'features/unicode-format' of https://github.com/mattnotmitt/CyberChef into mattnotmitt-features/unicode-format 2021-02-01 15:45:21 +00:00
n1474335 02cf394bcd ROT13 tweaks 2021-02-01 14:42:00 +00:00
n1474335 7cf19d22a8 Merge branch 'numberRot' of https://github.com/n1073645/CyberChef into n1073645-numberRot 2021-02-01 14:37:30 +00:00
n1474335 7ec91e2366 Merge branch 'patch-1' of https://github.com/xavier630/CyberChef into xavier630-patch-1 2021-02-01 14:31:42 +00:00
n1474335 9892ee273e Bugfix: ECC mode now works correctly in 'Generate PGP Key Pair' 2021-02-01 11:10:04 +00:00
n1474335 bf023cad48 Merge branch 'haversine' of https://github.com/mattnotmax/CyberChef into mattnotmax-haversine 2021-01-22 13:48:04 +00:00
n1474335 a41b1c2f5e Merge branch 'binaryLength' of https://github.com/n1073645/CyberChef into n1073645-binaryLength 2021-01-22 13:44:49 +00:00
n1474335 ae7c3fca31 Merge branch 'update_forensicswiki_url' of https://github.com/manicgiraffe/CyberChef into manicgiraffe-update_forensicswiki_url 2021-01-22 13:39:55 +00:00
n1474335 ec37a676a8 Updated dependencies 2020-12-14 17:51:12 +00:00
n1474335 f33193e122 Updated dependencies 2020-12-14 15:32:12 +00:00
n1474335 7c40204e4f Updated dependencies 2020-12-11 17:58:23 +00:00
n1474335 2b2ffb3346 Updated dependencies 2020-12-11 16:24:39 +00:00
mattnotmax a1109c43f6 Fix for haversine distance bug 2020-12-08 21:17:43 +11:00
mt3571 887ea0cf06 Changed an incorrect name 2020-12-01 13:49:34 +00:00
mt3571 3e0525ee9e Added in a new file to store the list of JWT algorithms that can be used, as this error was occurring due to a mismatch between what you could sign and what you could verify 2020-12-01 13:38:01 +00:00
Arthur Taggart e6eafc2843 Updated the links to forensic wiki website 2020-11-29 14:19:42 +00:00
Xavier Downs 3e8dea73d2
Update ScanForEmbeddedFiles.mjs 2020-11-24 12:18:02 +00:00
n1073645 bbf19ee944 argument added for numbers in ROT 2020-08-24 11:24:25 +01:00
n1073645 f6c8c9e76c swap endianness argument added to Windows Filetime To Unix Timestamp 2020-08-24 10:39:18 +01:00
n1073645 9dba1232b7 byte length argument added to ToBinary 2020-08-24 09:41:05 +01:00
Matt 3ab95384df
Add unicode tests 2020-08-19 10:55:29 +01:00
n1073645 953a581a94 byte length arg added 2020-08-17 14:12:29 +01:00
n1073645 3bfddd708c rectify week number 2020-08-17 10:40:00 +01:00
Matt 13a54ec318
Add unicode text format operation 2020-08-13 12:36:02 +01:00
n1073645 2781640a2a JSON to CSV improvements 2020-07-29 15:27:55 +01:00
n1073645 7989f119d3
Linting Modifications 2020-07-16 09:56:30 +01:00
Scott Howard 2e0aa7ae87 Don't pad rail fence decode fixes #1069 2020-07-15 22:05:15 -04:00
n1073645 667dfd820e info url added 2020-07-06 16:46:40 +01:00
n1073645 3e3c526a62 Caesar Box Cipher Added 2020-07-06 16:35:14 +01:00
n1073645 d68c8cb845 Casing Variations 2020-07-06 10:44:05 +01:00
d98762625 4dafa50799 improve some comments, remove unused properties from magic state shim in node API 2020-06-12 12:35:33 +01:00
Benedikt Werner f5a7db03cd
Base85: Only require 15 continuous base85 chars 2020-06-10 15:50:26 +02:00
Matt d4ae241758
Merge branch 'master' into rsa 2020-06-08 15:55:37 +01:00
hettysymes 88947b9d42 Added operation description note and modified comment formatting 2020-06-08 12:27:40 +01:00
hettysymes 3c68ad1302 Modified control rotor stepping so the next control rotor steps once the previous rotor reaches "O" and added tests 2020-06-07 17:45:17 +01:00
hettysymes e2b3389da6 Added SIGABA simple test 2020-06-06 19:47:15 +01:00
hettysymes 938385c18b Fixed grunt lint errors 2020-06-06 19:46:42 +01:00
hettysymes 5d01b06877 Added copyright and clarified description 2020-06-06 19:46:42 +01:00
hettysymes f007c093eb Emulation of the WW2 SIGABA machine
I have created an emulation of the SIGABA machine and have tested it against some test data from a Master's thesis by Miao Ai: https://scholarworks.sjsu.edu/cgi/viewcontent.cgi?article=1237&context=etd_projects
2020-06-06 19:46:42 +01:00
d98762625 53e69835ff Formally disallow flowcontrol operations from being used in bake recipes 2020-06-05 14:44:34 +01:00
d98762625 939208903a Allow magic in node api 2020-06-05 12:26:17 +01:00
n1073645 7526f4d7b1 Generate Epoch Time Operation Added 2020-06-01 13:47:51 +01:00
Matthieu 738ee33959 Fix bug in Normalise Unicode operation: replace nfc by nfkc 2020-05-27 15:47:40 +01:00
Matt 5ce3cc17bb Fixed tesseract issue 2020-05-27 15:00:34 +01:00
d98762625 d658f91106 Merge branch 'master' of github.com:gchq/CyberChef into javascript-minify 2020-05-27 11:54:07 +01:00
Benedikt Werner ee408f7add
Base85: Update magic regexes to require 20 non-whitespace base85 chars 2020-05-22 03:30:57 +02:00
Benedikt Werner 1294d764e2
Base85: Only remove start and end markers with standard/ascii85 encoding 2020-05-22 03:30:15 +02:00
Benedikt Werner eab1be0e2c
Magic base85: Remove 'i' flag 2020-05-20 00:23:50 +02:00
Benedikt Werner 15dd9d4c93
Add magic checks for base85 2020-05-16 00:42:50 +02:00
Benedikt Werner 103ecff6a7
Base85: Ignore whitespace 2020-05-16 00:42:31 +02:00
Benedikt Werner 0182cdda69
Base85: Fix alphabetName 2020-05-16 00:42:02 +02:00
n1073645 fae96af17d Info for sm3 added 2020-04-24 14:13:55 +01:00
n1073645 57c1a03c4f Option structures added for hashing algorithms 2020-04-24 14:04:13 +01:00
Alexander Prinzhorn cb8fe42c66 Put Base64 after Base62 2020-04-16 10:20:38 +02:00
Alexander Prinzhorn 7f4b2574b0 Use proper booleans instead of relying on truthy/falsy values 2020-04-16 09:59:43 +02:00
Matt fad163e0eb
Added tests (that can't be run) 2020-04-07 21:16:29 +01:00
Matt 7ad3992bd1
Add RSA Decrypt Operation 2020-04-07 13:31:33 +01:00
Matt e7b5c0e37c
Add RSA Encrypt Operation 2020-04-07 13:31:17 +01:00
n1073645 cc35127459 AAD for AES Added 2020-04-07 13:03:24 +01:00
Matt 1c0ecd29c2
Fix RSA operations 2020-04-07 11:45:54 +01:00
n1073645 1f0fddd0e9 Added magic signature to Microsoft Script Decoder 2020-04-07 10:33:15 +01:00
Matt 18c6b9bc09
Add RSA Verify operation 2020-04-06 15:24:22 +01:00
Matt 2233b9a094
Comment and add error handling to generate and sign 2020-04-06 15:24:06 +01:00
Matt e0f000b913
Fixed RSA generation and added digest option to verify 2020-04-06 13:35:14 +01:00
Matt 73864e0809
Merge branch 'master' into features/rsa 2020-04-05 12:08:24 +01:00
n1073645 cd8a85975c Info and description 2020-04-02 15:59:58 +01:00
n1073645 2f94ec20b0 Added to categories 2020-04-02 15:58:03 +01:00
n1073645 09d9deae43 ID3 Extractor Added. 2020-04-02 15:43:55 +01:00
71819 209fc07eac Issue 991: Add CBOR Decode operation 2020-03-30 11:31:25 +01:00
71819 ae70cb89ed Issue 991: Add CBOR Encode operation 2020-03-30 11:31:25 +01:00
71819 94e00115fe Issue 998: DishJSON should only replace undefined with new ArrayBuffer not null or false 2020-03-28 20:27:59 +00:00
n1073645 bda36e508a Regexes for magic for the new alphabets 2020-03-27 13:27:56 +00:00
n1073645 d2ea1273da Merge remote-tracking branch 'upstream/master' into base64Alphabets 2020-03-27 13:09:03 +00:00
n1474335 46cc48cfb9 Renamed Parse ObjectID Timestamp operation files 2020-03-27 12:09:57 +00:00
n1474335 45011de494 Tidied up TARGE extractor 2020-03-27 12:05:23 +00:00
n1474335 5e51ed0a5f Merge branch 'TargaExtractor' of https://github.com/n1073645/CyberChef into n1073645-TargaExtractor 2020-03-27 12:01:46 +00:00
n1474335 3a0c8a199a Tidied up 'Parse ObjectID Timestamp' operation 2020-03-27 11:56:42 +00:00
n1474335 9c729c4490 Merge branch 'parse-objectid-timestamp' of https://github.com/dmfj/CyberChef into dmfj-parse-objectid-timestamp 2020-03-27 11:48:55 +00:00
n1474335 ea090f79ee Merge branch 'stacking-fix' of https://github.com/cbeuw/CyberChef into cbeuw-stacking-fix 2020-03-27 10:17:54 +00:00
Andy Wang 1be6c54be2 Fix dropup menu being covered 2020-03-26 22:45:03 +00:00
n1474335 ad0a2e6f58 Merge branch 'MP3Extractor' of https://github.com/n1073645/CyberChef into n1073645-MP3Extractor 2020-03-26 12:01:30 +00:00
n1474335 b765534b8b Tidied up the Magic operation 2020-03-24 11:06:37 +00:00
n1073645 7c672c5ee9 MP3 Extractor added 2020-03-23 10:11:24 +00:00
n1073645 090bf3f8ec MP3 Extractor added 2020-03-23 10:10:47 +00:00
Dominic Fitch-Jones 9f4ef9cdad
Add ObjectId timestamp parser operation 2020-03-21 17:42:17 -04:00
n1474335 26fa66ef64 Merge branch 'newMagic' of https://github.com/n1073645/CyberChef into n1073645-newMagic 2020-03-20 14:51:40 +00:00
n1073645 b69e4567c0 MP3extractor 2020-03-19 16:10:22 +00:00
n1474335 2018b7e247 Fixed sitemap 2020-03-18 16:47:48 +00:00
n1474335 d0c43f5aa9 Added a challenge 2020-03-18 15:45:40 +00:00
n1474335 f864a5f31e Suppressed highlighting errors 2020-03-18 13:40:16 +00:00
n1073645 ff585584f6 MP3 Extractor 2020-03-18 12:51:47 +00:00
n1073645 2e0af64ac3 PGP secring signatures and Mac OS X keyring extractor added 2020-03-17 14:53:05 +00:00
n1073645 4251089687 Targa Image Extractor 2020-03-17 08:24:35 +00:00
n1073645 dbcd670ca8 Targa file extractor 2020-03-16 16:56:01 +00:00
n1474335 022ef71d2c Tidied up 'Convert to NATO alphabet' operation 2020-03-13 17:10:29 +00:00
n1474335 0fad891a3a Merge branch 'operation/convert-to-nato-alphabet' of https://github.com/MarvinJWendt/CyberChef into MarvinJWendt-operation/convert-to-nato-alphabet 2020-03-13 16:45:37 +00:00
n1474335 1a5dae76c2 Tidied up 'Generate Image' operation 2020-03-13 16:35:19 +00:00
n1474335 032c7f529a Merge branch 'generate_image' of https://github.com/pointhi/CyberChef into pointhi-generate_image 2020-03-13 16:20:45 +00:00
n1474335 58e8b4c618 Merge branch 'importFix' of https://github.com/n1073645/CyberChef into n1073645-importFix 2020-03-13 16:18:10 +00:00
n1474335 4308c717c3 Tests now display a progress bar and report long running tests 2020-03-13 14:59:48 +00:00
n1073645 30bc8dfbe9 UNIX Format Added for ToHexdump 2020-03-13 10:38:37 +00:00
n1073645 342b67581b Very small correction for import in Colossus 2020-03-13 10:14:08 +00:00
n1474335 75da5b650c Replaced 'new Date().getTime()' calls with 'Date.now()' for clarity and performance 2020-03-12 15:23:22 +00:00
n1073645 5b6a53be3e Docstrings added for Magic functions 2020-03-12 14:55:19 +00:00
n1073645 5b5105c864 Caching added for Magic regexes 2020-03-12 14:45:40 +00:00
n1474335 0eacab5ddc Tidied up Luhn checksum op 2020-03-12 14:41:46 +00:00
n1474335 0d7874bac1 Merge branch 'Luhn' of https://github.com/n1073645/CyberChef into n1073645-Luhn 2020-03-12 14:35:40 +00:00
n1073645 53a579028c Added only ASCII flag to ToHexdump 2020-03-12 09:30:48 +00:00
VirtualColossus a68bfd7223 Fix gchq#973 custom setting correction 2020-03-11 13:01:49 +00:00
n1073645 3f3a7cd4f6 From Hex Regexes 2020-03-10 11:12:43 +00:00
n1073645 54cb2d268b Luhn checksum tests 2020-03-09 09:37:34 +00:00
n1073645 0e40daecb6 Generates both the checksum and checkdigit. 2020-03-09 09:13:02 +00:00
n1474335 27b81c4e11 Tidied up JAR and DEB extractors 2020-03-06 15:59:42 +00:00
n1474335 8826c80e07 Merge branch 'debExtractor' of https://github.com/n1073645/CyberChef into n1073645-debExtractor 2020-03-06 15:57:16 +00:00
n1073645 02e3ce7fc1 Linting 2020-03-06 14:50:25 +00:00
n1073645 673e6aede5 Moved alternative JAR signature 2020-03-06 14:26:05 +00:00
n1474335 154b9386f7 Merge commit 'refs/pull/932/head' of github.com:gchq/CyberChef into n1073645-moreExtractors 2020-03-06 13:34:35 +00:00
n1073645 62dd7c3dbc Removed debugging try/catch 2020-03-06 13:29:11 +00:00
n1474335 82d098fc1a Merge branch 'moreExtractors' of https://github.com/n1073645/CyberChef into n1073645-moreExtractors 2020-03-06 13:21:13 +00:00
n1474335 24fd35e6af Tidied up Colossus operation 2020-03-06 13:05:08 +00:00
n1474335 c4493d15b6 Merge branch 'master' of https://github.com/VirtualColossus/CyberChef into VirtualColossus-master 2020-03-06 10:43:52 +00:00
n1474335 196a611c9b Merge branch 'extractWavFix' of https://github.com/n1073645/CyberChef into n1073645-extractWavFix 2020-03-05 17:09:54 +00:00
n1474335 7c057ad254 Added logo files to repository 2020-03-05 17:02:02 +00:00
n1474335 64b979e25e CipherSaber2 ops now accept a variety of key types 2020-03-05 16:39:52 +00:00
n1474335 5e7b004925 Merge branch 'NewCiphers' of https://github.com/n1073645/CyberChef into n1073645-NewCiphers 2020-03-05 15:25:10 +00:00
n1474335 ede78c540f Tidied up 'Luhn Checksum' operation 2020-03-05 15:19:23 +00:00
n1474335 c0f003b450 Merge branch 'Luhn' of https://github.com/n1073645/CyberChef into n1073645-Luhn 2020-03-05 15:16:50 +00:00
n1073645 14190fc533 DEB extractor 2020-03-05 15:01:07 +00:00
n1073645 940b56ba5f Luhn Checksum Operation Added 2020-02-26 10:55:15 +00:00
n1073645 8f2a1f5b2c Improved email regex 2020-02-25 14:48:22 +00:00
n1073645 20d0ae5304 Linting corrections 2020-02-25 11:35:39 +00:00
n1073645 2ba37af109 extra signatures 2020-02-25 11:33:35 +00:00
n1073645 728f8e65d6 Magic rebuild 2020-02-25 11:27:03 +00:00
n1474335 846ad1796a Merge branch 'MoreSignatures' of https://github.com/n1073645/CyberChef into n1073645-MoreSignatures 2020-02-19 12:04:30 +00:00
n1073645 355a6d6b76 Modifications made to CipherSaber2 2020-02-14 14:21:32 +00:00
n1073645 e71794d362 Tests added for LS47 2020-02-14 12:28:12 +00:00
n1073645 6090842372 Modifications made to ciphersaber 2020-02-14 09:15:50 +00:00
n1073645 0a3bd6456c Modifications made to signatures 2020-02-14 08:27:48 +00:00
n1474335 b045dc37f5 Tidied up infoURL in Rail Fence Cipher ops 2020-02-13 15:06:09 +00:00
n1474335 015d0f065f Merge branch 'master' of https://github.com/Flavsditz/CyberChef into Flavsditz-master 2020-02-13 15:04:00 +00:00
n1474335 c2212f9ab3 Tidied up To Hex mods 2020-02-13 14:17:43 +00:00
n1474335 3fb5bf14a6 Merge branch 'toHex' of https://github.com/cbeuw/CyberChef into cbeuw-toHex 2020-02-13 12:58:39 +00:00
Flavio Diez 0ab96dd4ca Throw OperationError instead of returning a String 2020-01-29 14:16:04 +01:00
Flavio Diez 1509b2b96c Implemented the Rail Fence Cipher with both encoding and decoding 2020-01-29 12:46:38 +01:00
n1073645 6fd929160d Comments and linting. 2020-01-28 10:35:01 +00:00
n1073645 5cdd062ed9 Linting done 2020-01-28 09:40:03 +00:00
comet 4430ea55c4
update 2020-01-27 17:02:13 -06:00
n1073645 0259ed8314 LS47 implemented, needs linting 2020-01-27 16:07:54 +00:00
n1073645 a06303c2fd CipherSaber2 added 2020-01-27 14:33:05 +00:00
n1073645 115b064081 Extra Signatures added 2020-01-23 12:56:51 +00:00
n1073645 3a2580fbc2 Extra Base64 Alphabets 2020-01-22 10:35:11 +00:00
Andy Wang 1197859865 Preserve null data when type is number in prepare 2020-01-18 14:56:17 +00:00
Andy Wang 293a95e938 Remove tickbox and make 0x comma an option 2020-01-18 13:55:32 +00:00
Andy Wang 9a3464a5ec Fix ingredient type conversion for null number 2020-01-18 13:19:28 +00:00
Andy Wang 23956480b7 Variable name 2020-01-17 18:47:46 +00:00
Andy Wang 6dbaf6a36c reverse highlight 2020-01-17 12:48:21 +00:00
Andy Wang 1d8c7dcb97 Allow output highlighting 2020-01-15 23:29:18 +00:00
Andy Wang 41c8a5aff0 fromHex can now extract 0x format 2020-01-15 22:20:47 +00:00
Andy Wang 597fba2fd0 Add line size formatting and comma separation 2020-01-15 00:14:43 +00:00
n1073645 0f0674daf6 More extractors added. 2020-01-09 09:57:12 +00:00
n1073645 d9b7fe2bb9 ExtractWAV fixed 2020-01-06 12:32:14 +00:00
n1474335 23a228bbd9 Tidied up Normalise Unicode operation 2019-12-20 16:05:24 +00:00
n1474335 598813ff88 Merge branch 'normalise-unicode' of https://github.com/matthieuxyz/CyberChef into matthieuxyz-normalise-unicode 2019-12-20 15:56:59 +00:00
n1474335 bf0bd620f1 Tidied up Case Insensitive Regex ops 2019-12-20 15:54:39 +00:00
n1474335 62edd76d7e Merge branch 'dev' of https://github.com/n1073645/CyberChef into n1073645-dev 2019-12-20 15:49:40 +00:00
n1474335 93c0c7cc10 Merge branch 'master' of https://github.com/bartblaze/CyberChef into bartblaze-master 2019-12-20 15:45:31 +00:00
n1073645 cde958af16 Linting 2019-12-20 15:27:46 +00:00
n1073645 bf70589b3c Tidy up 2019-12-20 15:23:30 +00:00
n1073645 78d1114869 Merge remote-tracking branch 'upstream/master' into dish-fix 2019-12-20 15:22:31 +00:00
n1474335 cb09949fb9 Merge branch 'gzip-bugfix' of https://github.com/n1073645/CyberChef into n1073645-gzip-bugfix 2019-12-20 15:17:36 +00:00
n1474335 b8afbf7458 Tidied up ICO extractor 2019-12-20 15:04:27 +00:00
n1474335 be59efbd6b Merge branch 'ICOextractor' of https://github.com/n1073645/CyberChef into n1073645-ICOextractor 2019-12-20 15:03:05 +00:00
n1474335 9112bd4936 Tidied up OLE2 extractor 2019-12-20 15:00:10 +00:00
n1474335 3e513efd59 Merge branch 'OLE2' of https://github.com/n1073645/CyberChef into n1073645-OLE2 2019-12-20 14:47:50 +00:00
n1073645 72ba579e1e Remove unnecessary comments. 2019-12-17 12:17:13 +00:00
n1073645 5fd2512a9b Gzip tests added 2019-12-17 12:15:11 +00:00
n1073645 3a1a6a94d2 Sets the gzip comment bitfield 2019-12-16 17:05:06 +00:00
n1474335 928178716a Operation elements now have decreasing z-index properties, meaning dropdowns do not get hidden. Fixes #925 2019-12-16 14:46:06 +00:00
n1073645 6e411c9dd9 Merge remote-tracking branch 'upstream/master' into dish-fix 2019-12-13 16:11:48 +00:00
n1073645 86db43e6dd Fixed the magic bug where it wouldnt recommended operations that resulted in lists of files 2019-12-13 16:09:02 +00:00
n1474335 4d8b1721bc Always display HTML outputs even if they are above the size threshold. Could lead to crashing, but this risk is accepted. 2019-12-13 14:57:03 +00:00
n1474335 fd390bc61b Improved CR preservation logic - now based on entropy 2019-12-13 14:45:13 +00:00
n1474335 813a151524 Added 'Show all' button to output file overlay 2019-12-13 12:59:59 +00:00
Bart c06502cd76
Improve RTF detection
Certain RTF files may attempt to thwart detection by having a malformed RTF header, such as **{\rt000**. Removing 0x66 will result in detecting these malformed yet valid RTFs as well.

Additional reading:
https://www.decalage.info/rtf_tricks#Trick_1:_Incomplete_RTF_Header
2019-12-11 22:58:33 +01:00
n1474335 d2dc50fe8e Fixed file overlay icon 2019-12-10 16:21:53 +00:00
n1474335 86ebed132d Updated dependencies 2019-12-09 13:51:48 +00:00
n1073645 47ccafcbb2 Linting and tidy up 2019-12-05 09:47:32 +00:00
VirtualColossus ccdd2af8be Added tests, removed debug 2019-12-04 22:43:22 +00:00
VirtualColossus a387db6109 Merge branch 'master' of https://github.com/VirtualColossus/CyberChef 2019-12-04 14:29:41 +00:00
VirtualColossus b88a35cd14 Added P5 limitation 2019-12-04 14:28:53 +00:00
VirtualColossus bcafaebf77 Merge remote-tracking branch 'upstream/master' 2019-12-04 14:28:05 +00:00
n1474335 61e6423d95 Added word separator code to Morse Code ops. 2019-12-02 15:17:17 +00:00
VirtualColossus c32fec6b53 Various fixes for conditional calcs 2019-11-30 10:25:24 +00:00
VirtualColossus 4c0d944992 Merge remote-tracking branch 'upstream/master' 2019-11-29 20:36:06 +00:00
VirtualColossus 57ee3f305d Fixed issue in counter 2019-11-28 13:56:02 +00:00