commit | 14e13545571f602b0680cc7cab6178ee1c7fbacb | [log] [tgz] |
---|---|---|
author | Matthias Koller <m.koller@peak-solution.de> | Fri Nov 08 13:20:19 2019 +0100 |
committer | Matthias Koller <m.koller@peak-solution.de> | Fri Nov 08 13:20:19 2019 +0100 |
tree | 42aa8912de2215cac53a06baea54a649b22415e1 | |
parent | 67b39b98078cb6593b0396dea14e80e9e89abe20 [diff] | |
parent | 6b5905c4f3eb5bbfacc547d9078adadf29909f65 [diff] |
Merge branch 'dev' into mkoller/atfxadapter Conflicts: build.gradle Signed-off-by: Matthias Koller <m.koller@peak-solution.de>