tree a373a1fb9e01fa76419918cbc077e11ccd8a4c64
parent ca97968b5652bddb8ff8e269e6c15407c1cf27e1
parent 7251987197d5043f4671698b5f59bb6b7e9d309c
author Matthias Koller <m.koller@peak-solution.de> 1570432326 +0200
committer Matthias Koller <m.koller@peak-solution.de> 1570432326 +0200

Merge branch 'dev' into mkoller/atfxadapter

Conflicts:
	build.gradle


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