tree 3d3266c242d8345974edbeba1cbc3586474e67b4
parent e6db0405afaf81ed70c429469f99381ae974d4a3
parent 6570925a091ea9c7ec5707a13f0a2435795b47ec
author Matthias Koller <m.koller@peak-solution.de> 1573213265 +0100
committer Matthias Koller <m.koller@peak-solution.de> 1573213265 +0100

Merge branch 'dev' into mkoller/atfxadapter

Conflicts:
	build.gradle

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