tree 42aa8912de2215cac53a06baea54a649b22415e1
parent 67b39b98078cb6593b0396dea14e80e9e89abe20
parent 6b5905c4f3eb5bbfacc547d9078adadf29909f65
author Matthias Koller <m.koller@peak-solution.de> 1573215619 +0100
committer Matthias Koller <m.koller@peak-solution.de> 1573215619 +0100

Merge branch 'dev' into mkoller/atfxadapter

Conflicts:
	build.gradle

Signed-off-by: Matthias Koller <m.koller@peak-solution.de>