mirror of
https://github.com/gchq/CyberChef.git
synced 2025-05-13 09:36:52 -04:00
resolve conflicts with master
This commit is contained in:
parent
0a6d0d1352
commit
97e5e44723
11 changed files with 189 additions and 30 deletions
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "cyberchef",
|
||||
"version": "8.11.2",
|
||||
"version": "8.12.1",
|
||||
"description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
|
||||
"author": "n1474335 <n1474335@gmail.com>",
|
||||
"homepage": "https://gchq.github.io/CyberChef",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue