commit | f54e3c8853d23a24b3dd041d51e46ca004400445 | [log] [tgz] |
---|---|---|
author | Matthias Koller <m.koller@peak-solution.de> | Wed Feb 20 14:38:50 2019 +0100 |
committer | Matthias Koller <m.koller@peak-solution.de> | Wed Feb 20 14:38:50 2019 +0100 |
tree | eed542f0927b3b1b019232e76468ac6e608c098f | |
parent | 23657a94fc578471f82fb4a28486fc002912b738 [diff] | |
parent | 8ae2b4302b3001d95dbc5949a340eeebebc43fab [diff] |
Merge remote-tracking branch 'dev' into mkoller/atfxadapter Conflicts: build.gradle Signed-off-by: Matthias Koller <m.koller@peak-solution.de>