troosan c28cbd7f08 Merge branch 'develop' of https://github.com/PHPOffice/PHPWord into
develop_v1.0

# Conflicts:
#	.travis.yml
#	composer.json
2021-02-21 23:02:55 +01:00
..