Merge from master

2018-09-25 23:46:55 +01:00
parent 0a8feca6ab 00a20b7cfc
commit 466e880bfc
40 changed files with 1036 additions and 140 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "docx",
-  "version": "4.0.0",
+  "version": "4.1.0",
  "description": "Generate .docx documents with JavaScript (formerly Office-Clippy)",
  "main": "build/index.js",
  "scripts": {