commit | a97c48c3fe86dd0f40315f9921e32a013d07689a | [log] [tgz] |
---|---|---|
author | Matthias Koller <m.koller@peak-solution.de> | Wed Jul 03 14:18:27 2019 +0200 |
committer | Matthias Koller <m.koller@peak-solution.de> | Wed Jul 03 14:18:27 2019 +0200 |
tree | a649fcf1f419f1f3bdd0eac694158e8499809e38 | |
parent | c388ebf51b7270f0ca81c11935a9da7d1744b6f7 [diff] | |
parent | 1b356a06e22aa5ae67fb30691678397673e0f028 [diff] |
Merge remote-tracking branch 'dev' into mkoller/atfxadapter Conflicts: build.gradle Signed-off-by: Matthias Koller <m.koller@peak-solution.de>