Merged master

This commit is contained in:
n1474335 2017-05-06 16:22:25 +01:00
commit 0dc72d8301
30 changed files with 411 additions and 308 deletions

View file

@ -1,6 +1,6 @@
{
"name": "cyberchef",
"version": "5.3.0",
"version": "5.3.5",
"description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
"author": "n1474335 <n1474335@gmail.com>",
"homepage": "https://gchq.github.io/CyberChef",
@ -53,6 +53,7 @@
"ink-docstrap": "^1.1.4",
"node-sass": "^4.5.2",
"sass-loader": "^6.0.3",
"jsdoc-babel": "^0.3.0",
"style-loader": "^0.15.0",
"url-loader": "^0.5.8",
"web-resource-inliner": "^4.1.0",
@ -71,7 +72,7 @@
"google-code-prettify": "^1.0.5",
"jquery": "^3.1.1",
"jsbn": "^1.1.0",
"jsrsasign": "^7.1.0",
"jsrsasign": "7.1.3",
"lodash": "^4.17.4",
"moment": "^2.17.1",
"moment-timezone": "^0.5.11",