Merge branch 'master' into develop

This commit is contained in:
Thilina Pituwala
2020-05-20 21:22:34 +02:00
2 changed files with 2 additions and 2 deletions

View File

@@ -217,7 +217,7 @@ if (typeof define === 'function' && define.amd) define([], () => Aes); // AMD
/* jshint node:true *//* global define, escape, unescape, btoa, atob */ /* jshint node:true *//* global define, escape, unescape, btoa, atob */
'use strict'; 'use strict';
if (typeof module !== 'undefined' && module.exports) var Aes = require('./aes'); // CommonJS (Node.js) if (typeof module !== 'undefined' && module.exports) var Aes = require('./Aes'); // CommonJS (Node.js)
/** /**

2
web/dist/common.js vendored

File diff suppressed because one or more lines are too long