smartyellow/docx-js
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/multiple-sections' of https://github.com/h4buli/docx into feat/multiple-headers

Browse Source 
# Conflicts:
#	src/export/packer/compiler.ts
#	src/file/content-types/content-types.ts
#	src/file/document/body/section-properties/header-reference/header-reference.ts
#	src/file/document/body/section-properties/section-properties.ts
#	src/file/file.ts
#	src/file/media/media.ts
This commit is contained in:
Dolan Miu
2018-06-22 22:59:38 +01:00
parent 8b3cf8c38c 0b963ec3b8
commit f1ac646518
33 changed files with 621 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -65,6 +65,7 @@
"awesome-typescript-loader": "^3.4.1",
"chai": "^3.5.0",
"glob": "^7.1.2",
"jszip": "^3.1.5",
"mocha": "^3.2.0",
"mocha-webpack": "^1.0.1",
"prettier": "^1.12.1",