tree f84bf83640af8639ecb78e9186ff39b6f1d49fe7
parent 5b6ff5af354b81f9513d128ae85f3d92fe33cffe
parent f5a01ce47a21cf8071e4eb1b0cec115050b0c8cc
author Matthias Koller <m.koller@peak-solution.de> 1562156121 +0200
committer Matthias Koller <m.koller@peak-solution.de> 1562156121 +0200

Merge remote-tracking branch 'dev' into mkoller/atfxadapter

Conflicts:
	build.gradle


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