tree 7e8489e48f26382bc2fb795a79062fbc542e4379
parent a00264f0b6cc4ee5fbecf287627dd75f93c837e8
parent 86bcd73b81574162229f85220de8252e4454c98b
author Matthias Koller <m.koller@peak-solution.de> 1565689799 +0200
committer Matthias Koller <m.koller@peak-solution.de> 1565689799 +0200

Merge branch 'dev' into mkoller/atfxadapter

Conflicts:
	build.gradle

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