Skip to content

Commit

Permalink
Merge pull request #319 from open-dynaMIX/prepare_release_4.1.0
Browse files Browse the repository at this point in the history
Prepare release 4.1.0
  • Loading branch information
David Vogt authored Sep 10, 2020
2 parents 28131be + 2d795d0 commit 48b0a9f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ repos:
- id: isort
name: isort
language: system
entry: isort -y
entry: isort
types: [python]
- id: flake8
name: flake8
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## 4.1.0
### Feature
* Support inline images for docx-template (37e42724c75a5f5c8ab60ee45a2fd64118cdf407)

### Fix
* Correctly validate image placeholders (9617bd71db90901ae0e18c513bc28bb3225b7857)
* Also add template to context in engine validation (639e9c27435873ca8680308684d799ea9da29d6a)


## 4.0.1

### Fix
Expand Down
2 changes: 1 addition & 1 deletion document_merge_service/document_merge_service_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

__title__ = "document_merge_service"
__description__ = "Merge Document Template Service"
__version__ = "4.0.1"
__version__ = "4.1.0"
__author__ = "Adfinis SyGroup AG"
__url__ = "https://github.com/adfinis-sygroup/document-merge-service"

0 comments on commit 48b0a9f

Please sign in to comment.