Merged upstream master

This commit is contained in:
n1474335 2017-09-17 14:53:17 +01:00
commit d3246b7c8b
85 changed files with 3265 additions and 1477 deletions

View file

@ -12,10 +12,10 @@ const ExtractTextPlugin = require("extract-text-webpack-plugin");
const banner = `/**
* CyberChef - The Cyber Swiss Army Knife
*
* @copyright Crown Copyright 2016
* @copyright Crown Copyright 2017
* @license Apache-2.0
*
* Copyright 2016 Crown Copyright
* Copyright 2017 Crown Copyright
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -110,4 +110,7 @@ module.exports = {
modules: false,
warningsFilter: /source-map/,
},
node: {
fs: "empty"
}
};