Merged master into feature-unicode-strings

This commit is contained in:
n1474335 2018-01-12 23:57:02 +00:00
commit fff188eb30
20 changed files with 336 additions and 147 deletions

View file

@ -1,6 +1,6 @@
{
"name": "cyberchef",
"version": "7.2.1",
"version": "7.5.0",
"description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
"author": "n1474335 <n1474335@gmail.com>",
"homepage": "https://gchq.github.io/CyberChef",
@ -68,6 +68,7 @@
},
"dependencies": {
"babel-polyfill": "^6.26.0",
"bignumber.js": "^5.0.0",
"bootstrap": "^3.3.7",
"bootstrap-colorpicker": "^2.5.2",
"bootstrap-switch": "^3.3.4",