commit | f7fffae299d52c9fabf335f098c302e2392a9b0c | [log] [tgz] |
---|---|---|
author | Matthias Koller <m.koller@peak-solution.de> | Mon Oct 07 09:11:29 2019 +0200 |
committer | Matthias Koller <m.koller@peak-solution.de> | Mon Oct 07 09:11:29 2019 +0200 |
tree | ca8e6e50d7435dc0395e5489e748c1590e2dcda9 | |
parent | 9912d0497a8d5aa7b9e9e0514f734177ba1c12cb [diff] | |
parent | c2d7abbe32b1ebce522b2ed787be8b7996ca8880 [diff] |
Merge branch 'dev' into mkoller/atfxadapter Conflicts: build.gradle Signed-off-by: Matthias Koller <m.koller@peak-solution.de>