Merge branch 'master' into webcrypto, implementing base58, fixes #377

This commit is contained in:
El RIDO 2019-05-15 21:20:54 +02:00
commit 6f480bf014
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
7 changed files with 259 additions and 140 deletions

View file

@ -17,6 +17,7 @@ global.prettyPrint = window.PR.prettyPrint;
global.prettyPrintOne = window.PR.prettyPrintOne;
global.showdown = require('./showdown-1.8.6');
global.DOMPurify = require('./purify-1.0.7');
global.baseX = require('./base-x-3.0.5.1').baseX;
require('./bootstrap-3.3.7');
require('./privatebin');