tree b252ca46f3bb02a3c8fa4bcf83e80861e6a3de6b
parent 62343e3030cd5fa032a5535e9cf0ed850265e538
parent 4cf4d7f9439c72124be5b99ba85abb113f9ed800
author Matthias Koller <m.koller@peak-solution.de> 1573213577 +0100
committer Matthias Koller <m.koller@peak-solution.de> 1573213577 +0100

Merge branch 'dev' into mkoller/atfxadapter

Conflicts:
	build.gradle

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