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

Resolved conflicts

Browse source
This commit is contained in:
n1474335 2017-12-27 12:50:29 +00:00
commit e2161ec934
25 changed files with 811 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/Utils.js
View file

@ -879,7 +879,7 @@ const Utils = {
*
* fragment = *( pchar / "/" / "?" )
* query = *( pchar / "/" / "?" )
* pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
* pchar = unreserved / pct-encoded / sub-delims / ":" / "@"
* unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
* pct-encoded = "%" HEXDIG HEXDIG
* sub-delims = "!" / "$" / "&" / "'" / "(" / ")"