tree 72b6d943d66056ea4ad6a543b1f229f21ff25e26
parent 03bb9cbd44f1111612db6a2cd7b3fc115c1a7b03
parent 2e5db06c9a80a1e5c4362321b0aa4ce095306c68
author PVPoyer <pieter.vanpoyer@portofantwerp.com> 1624893640 +0200
committer PVPoyer <pieter.vanpoyer@portofantwerp.com> 1624893640 +0200

Merge branch 'master' into 1.3.x

# Conflicts:
#	RELEASENOTES.md
#	package.json
#	plugin.xml