resolve conflicts with master

This commit is contained in:
d98762625 2018-11-23 10:54:16 +00:00
parent 0a6d0d1352
commit 97e5e44723
11 changed files with 189 additions and 30 deletions

View file

@ -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",