tree e74bc0431d037e0b186cb2ba3c427a513ab7c05d
parent a8c4f8882174438525d7657c454d3b5318a1dc3c
parent d653c4368e6ff0205be1870825f494bd2c0c910b
author Matthias Koller <m.koller@peak-solution.de> 1612792949 +0100
committer Matthias Koller <m.koller@peak-solution.de> 1612793907 +0100

Merge branch 'mkoller/nodeprovider' into mkoller/webclient

Conflicts:
	api/atfxadapter/openatfx/build.gradle

Change-Id: Ieab74c9222711b539e0f6d962208824631f54116