2 Commits

Author	SHA1	Message	Date
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
Igor Bulovski	ac40a40ec0	refactor: move components from /drawing/inline to /drawing ... - they will be used for other positioning element (floating)	2018-06-08 07:50:23 +02:00