Merge branch 'feature_vigenere'

Conflicts:
	build/prod/cyberchef.htm
	build/prod/index.html
	build/prod/scripts.js
	src/static/stats.txt
This commit is contained in:
Matt C 2016-12-06 20:27:14 +00:00
commit ac3a0b35f5

View file

@ -3,7 +3,7 @@
/** /**
* Cipher operations. * Cipher operations.
* *
* @author n1474335 [n1474335@gmail.com] & Matt C [matt@artemisbot.pw] * @author n1474335 [n1474335@gmail.com]
* @copyright Crown Copyright 2016 * @copyright Crown Copyright 2016
* @license Apache-2.0 * @license Apache-2.0
* *
@ -395,6 +395,7 @@ var Cipher = {
/** /**
* Vigenere cipher encode. * Vigenere cipher encode.
* *
* @author Matt C [matt@artemisbot.pw]
* @param {string} input * @param {string} input
* @param {Object[]} args * @param {Object[]} args
* @returns {string} * @returns {string}
@ -442,6 +443,7 @@ var Cipher = {
/** /**
* Vigenere cipher decode. * Vigenere cipher decode.
* *
* @author Matt C [matt@artemisbot.pw]
* @param {string} input * @param {string} input
* @param {Object[]} args * @param {Object[]} args
* @returns {string} * @returns {string}