| commit | 9912d0497a8d5aa7b9e9e0514f734177ba1c12cb | [log] [tgz] |
|---|---|---|
| author | Matthias Koller <m.koller@peak-solution.de> | Tue Aug 13 11:51:20 2019 +0200 |
| committer | Matthias Koller <m.koller@peak-solution.de> | Tue Aug 13 11:51:20 2019 +0200 |
| tree | 46f6e591e1491ae311066580aed1cfeaef698663 | |
| parent | 41302ebaf9666fef0f17298bd9ed999940b0264c [diff] | |
| parent | a57ebdae1861e2382adb7bf028602d801c512e7d [diff] |
Merge branch 'dev' into mkoller/atfxadapter Conflicts: build.gradle Signed-off-by: Matthias Koller <m.koller@peak-solution.de>