Dolan Miu 0f4c2e64f4 Merge branch 'master' of https://github.com/h4buli/docx into feat/h4-update ...

# Conflicts:
#	package.json
#	src/file/drawing/drawing.ts
#	src/file/media/media.ts
#	src/file/paragraph/run/picture-run.ts
#	src/file/styles/external-styles-factory.ts
#	src/file/xml-components/imported-xml-component.ts

2018-06-09 23:29:59 +01:00

..

graphic

Merge branch 'master' of https://github.com/h4buli/docx into feat/h4-update

2018-06-09 23:29:59 +01:00

index.ts

Add more files for creating a drawing

2018-01-11 01:47:09 +00:00

inline-attributes.ts

add support for floating drawings

2018-06-08 16:03:04 +02:00

inline.ts

Merge branch 'master' of https://github.com/h4buli/docx into feat/h4-update

2018-06-09 23:29:59 +01:00