Merge remote-tracking branch 'origin/master' into touchdown
Conflicts: static/js/app.js
This commit is contained in:
commit
73a0cc791b
48 changed files with 772 additions and 386 deletions
|
@ -230,3 +230,4 @@ var saveAs = saveAs
|
|||
// with an attribute `content` that corresponds to the window
|
||||
|
||||
if (typeof module !== 'undefined') module.exports = saveAs;
|
||||
window.saveAs = saveAs;
|
Reference in a new issue